diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-08 20:05:53 -0400 |
|---|---|---|
| committer | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-13 11:37:45 -0400 |
| commit | 609a7215e6ef705fd098fd4adb4f922795ff1119 (patch) | |
| tree | cba7742899754d237f2eab6d74634f4f23fd7667 /devtools/client/framework/toolbox-process-window.js | |
| parent | 7591326915a100b54ca17ad6fedb391645bac6b5 (diff) | |
| download | UXP-609a7215e6ef705fd098fd4adb4f922795ff1119.tar UXP-609a7215e6ef705fd098fd4adb4f922795ff1119.tar.gz UXP-609a7215e6ef705fd098fd4adb4f922795ff1119.tar.lz UXP-609a7215e6ef705fd098fd4adb4f922795ff1119.tar.xz UXP-609a7215e6ef705fd098fd4adb4f922795ff1119.zip | |
Issue #991 Part 3: Devtools
Diffstat (limited to 'devtools/client/framework/toolbox-process-window.js')
| -rw-r--r-- | devtools/client/framework/toolbox-process-window.js | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js index 8ead718b3..c34fe3355 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, |