This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch upstream/28.5.0 in repository pale-moon. commit 609a7215e6ef705fd098fd4adb4f922795ff1119 Author: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Mon Apr 8 20:05:53 2019 -0400 Issue #991 Part 3: Devtools --- devtools/client/framework/devtools.js | 7 +------ devtools/client/framework/toolbox-process-window.js | 17 ++++++----------- devtools/client/framework/toolbox.js | 7 +------ devtools/client/inspector/markup/markup.js | 7 ++----- devtools/shared/touch/simulator-core.js | 15 ++------------- 5 files changed, 12 insertions(+), 41 deletions(-) diff --git a/devtools/client/framework/devtools.js b/devtools/client/framework/devtools.js index 90f8802..976a4b5 100644 --- a/devtools/client/framework/devtools.js +++ b/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; }, diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js index 8ead718..c34fe33 100644 --- a/devtools/client/framework/toolbox-process-window.js +++ b/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, diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js index 926e306..cde7de0 100644 --- a/devtools/client/framework/toolbox.js +++ b/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); diff --git a/devtools/client/inspector/markup/markup.js b/devtools/client/inspector/markup/markup.js index d6e9f8c..a4b65c8 100644 --- a/devtools/client/inspector/markup/markup.js +++ b/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); diff --git a/devtools/shared/touch/simulator-core.js b/devtools/shared/touch/simulator-core.js index 6933f92..fff7d2e 100644 --- a/devtools/shared/touch/simulator-core.js +++ b/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; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git