Browse Source

Issue #991 Part 3: Devtools

pull/7/head
Ascrod 3 years ago committed by Roy Tam
parent
commit
e2e42f0e1a
  1. 7
      devtools/client/framework/devtools.js
  2. 17
      devtools/client/framework/toolbox-process-window.js
  3. 7
      devtools/client/framework/toolbox.js
  4. 7
      devtools/client/inspector/markup/markup.js
  5. 15
      devtools/shared/touch/simulator-core.js

7
devtools/client/framework/devtools.js

@ -195,12 +195,7 @@ DevTools.prototype = {
return tool;
}
let enabled;
try {
enabled = Services.prefs.getBoolPref(tool.visibilityswitch);
} catch (e) {
enabled = true;
}
let enabled = Services.prefs.getBoolPref(tool.visibilityswitch, true);
return enabled ? tool : null;
},

17
devtools/client/framework/toolbox-process-window.js

@ -100,17 +100,12 @@ function openToolbox({ form, chrome, isTabActor }) {
};
TargetFactory.forRemoteTab(options).then(target => {
let frame = document.getElementById("toolbox-iframe");
let selectedTool = "jsdebugger";
try {
// Remember the last panel that was used inside of this profile.
selectedTool = Services.prefs.getCharPref("devtools.toolbox.selectedTool");
} catch(e) {}
try {
// But if we are testing, then it should always open the debugger panel.
selectedTool = Services.prefs.getCharPref("devtools.browsertoolbox.panel");
} catch(e) {}
// Remember the last panel that was used inside of this profile.
// But if we are testing, then it should always open the debugger panel.
let selectedTool =
Services.prefs.getCharPref("devtools.toolbox.selectedTool",
Services.prefs.getCharPref("devtools.browsertoolbox.panel",
"jsdebugger"));
let options = { customIframe: frame };
gDevTools.showToolbox(target,

7
devtools/client/framework/toolbox.js

@ -1131,12 +1131,7 @@ Toolbox.prototype = {
setToolboxButtonsVisibility: function () {
this.toolboxButtons.forEach(buttonSpec => {
let { visibilityswitch, button, isTargetSupported } = buttonSpec;
let on = true;
try {
on = Services.prefs.getBoolPref(visibilityswitch);
} catch (ex) {
// Do nothing.
}
let on = Services.prefs.getBoolPref(visibilityswitch, true);
on = on && isTargetSupported(this.target);

7
devtools/client/inspector/markup/markup.js

@ -73,11 +73,8 @@ function MarkupView(inspector, frame, controllerWindow) {
this._elt = this.doc.querySelector("#root");
this.htmlEditor = new HTMLEditor(this.doc);
try {
this.maxChildren = Services.prefs.getIntPref("devtools.markup.pagesize");
} catch (ex) {
this.maxChildren = DEFAULT_MAX_CHILDREN;
}
this.maxChildren = Services.prefs.getIntPref("devtools.markup.pagesize",
DEFAULT_MAX_CHILDREN);
this.collapseAttributes =
Services.prefs.getBoolPref(ATTR_COLLAPSE_ENABLED_PREF);

15
devtools/shared/touch/simulator-core.js

@ -18,19 +18,8 @@ var systemAppOrigin = (function () {
return systemOrigin;
})();
var threshold = 25;
try {
threshold = Services.prefs.getIntPref("ui.dragThresholdX");
} catch (e) {
// Fall back to default value
}
var delay = 500;
try {
delay = Services.prefs.getIntPref("ui.click_hold_context_menus.delay");
} catch (e) {
// Fall back to default value
}
var threshold = Services.prefs.getIntPref("ui.dragThresholdX", 25);
var delay = Services.prefs.getIntPref("ui.click_hold_context_menus.delay", 500);
function SimulatorCore(simulatorTarget) {
this.simulatorTarget = simulatorTarget;

Loading…
Cancel
Save