From 00d813243a4cccd60737e8d559133c644170aa2f Mon Sep 17 00:00:00 2001 From: Brian Grinstead Date: Wed, 18 Jul 2018 07:23:22 -0700 Subject: [PATCH] Bug 1469341 - Remove the XUL wrapper document for the Browser Console;r=nchevobbe MozReview-Commit-ID: KCZ6u5byQuO --HG-- extra : rebase_source : 2d1495576ca2c7a956a2327cff2f9fbc8bbb0010 --- devtools/client/jar.mn | 1 - devtools/client/preferences/devtools-client.js | 3 --- devtools/client/webconsole/browserconsole.xul | 18 ------------------ .../client/webconsole/components/JSTerm.js | 3 +-- devtools/client/webconsole/hudservice.js | 15 ++------------- .../browser_console_context_menu_entries.js | 3 +-- .../mochitest/browser_console_open_or_focus.js | 4 ++-- 7 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 devtools/client/webconsole/browserconsole.xul diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn index f6e2c4a11bf6..d4a05d5beb6f 100644 --- a/devtools/client/jar.mn +++ b/devtools/client/jar.mn @@ -9,7 +9,6 @@ devtools.jar: content/shared/widgets/widgets.css (shared/widgets/widgets.css) content/shared/widgets/VariablesView.xul (shared/widgets/VariablesView.xul) content/webconsole/index.html (webconsole/index.html) - content/webconsole/browserconsole.xul (webconsole/browserconsole.xul) * content/scratchpad/index.xul (scratchpad/index.xul) content/shared/splitview.css (shared/splitview.css) content/shared/theme-switching.js (shared/theme-switching.js) diff --git a/devtools/client/preferences/devtools-client.js b/devtools/client/preferences/devtools-client.js index 9b14a0e9fe14..9c09c304e4cc 100644 --- a/devtools/client/preferences/devtools-client.js +++ b/devtools/client/preferences/devtools-client.js @@ -233,9 +233,6 @@ pref("devtools.accessibility.enabled", false); // Web Audio Editor Inspector Width should be a preference pref("devtools.webaudioeditor.inspectorWidth", 300); -// Experimental UI for the browser console that doesn't use a XUL wrapper doc -pref("devtools.browserconsole.html", false); - // Web console filters pref("devtools.webconsole.filter.error", true); pref("devtools.webconsole.filter.warn", true); diff --git a/devtools/client/webconsole/browserconsole.xul b/devtools/client/webconsole/browserconsole.xul deleted file mode 100644 index 6044978ac026..000000000000 --- a/devtools/client/webconsole/browserconsole.xul +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - diff --git a/devtools/client/webconsole/components/JSTerm.js b/devtools/client/webconsole/components/JSTerm.js index 752303ce1463..08981a1014da 100644 --- a/devtools/client/webconsole/components/JSTerm.js +++ b/devtools/client/webconsole/components/JSTerm.js @@ -1475,8 +1475,7 @@ class JSTerm extends Component { // toolbox-textbox-context-popup and friends. For now, fall // back to use that if running inside the toolbox, but use our // own menu when running in the Browser Console (see Bug 1476097). - if (this.props.hud.isBrowserConsole && - Services.prefs.getBoolPref("devtools.browserconsole.html")) { + if (this.props.hud.isBrowserConsole) { this.props.serviceContainer.openEditContextMenu(e); } } diff --git a/devtools/client/webconsole/hudservice.js b/devtools/client/webconsole/hudservice.js index 034f0d4c0bfa..a45258ac3c96 100644 --- a/devtools/client/webconsole/hudservice.js +++ b/devtools/client/webconsole/hudservice.js @@ -175,9 +175,8 @@ HUDService.prototype = { } async function openWindow(t) { - const win = Services.ww.openWindow(null, Tools.webConsole.browserConsoleURL, + const win = Services.ww.openWindow(null, Tools.webConsole.url, "_blank", BC_WINDOW_FEATURES, null); - let iframeWindow = win; await new Promise(resolve => { win.addEventListener("DOMContentLoaded", resolve, {once: true}); @@ -185,17 +184,7 @@ HUDService.prototype = { win.document.title = l10n.getStr("browserConsole.title"); - // With a XUL wrapper doc, we host index.html in an iframe. - // Wait for that to be ready before resolving: - if (!Tools.webConsole.browserConsoleUsesHTML) { - const iframe = win.document.querySelector("iframe"); - await new Promise(resolve => { - iframe.addEventListener("DOMContentLoaded", resolve, {once: true}); - }); - iframeWindow = iframe.contentWindow; - } - - return {iframeWindow, chromeWindow: win}; + return {iframeWindow: win, chromeWindow: win}; } // Temporarily cache the async startup sequence so that if toggleBrowserConsole diff --git a/devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js b/devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js index 5d7a9dd9c917..bb87450b1ddd 100644 --- a/devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js +++ b/devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js @@ -11,8 +11,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + add_task(async function() { // Enable net messages in the console for this test. await pushPref("devtools.browserconsole.filter.net", true); - // These are required for testing the text input in the browser console: - await pushPref("devtools.browserconsole.html", true); + // This is required for testing the text input in the browser console: await pushPref("devtools.chrome.enabled", true); await addTab(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_console_open_or_focus.js b/devtools/client/webconsole/test/mochitest/browser_console_open_or_focus.js index 71407d647f57..9bba73ca0a31 100644 --- a/devtools/client/webconsole/test/mochitest/browser_console_open_or_focus.js +++ b/devtools/client/webconsole/test/mochitest/browser_console_open_or_focus.js @@ -27,12 +27,12 @@ add_task(async function() { await waitFor(() => findMessage(hud, TEST_MESSAGE)); currWindow = Services.wm.getMostRecentWindow(null); - is(currWindow.document.documentURI, Tools.webConsole.browserConsoleURL, + is(currWindow.document.documentURI, Tools.webConsole.url, "The Browser Console is open and has focus"); mainWindow.focus(); await HUDService.openBrowserConsoleOrFocus(); currWindow = Services.wm.getMostRecentWindow(null); - is(currWindow.document.documentURI, Tools.webConsole.browserConsoleURL, + is(currWindow.document.documentURI, Tools.webConsole.url, "The Browser Console is open and has focus"); await HUDService.toggleBrowserConsole(); hud = HUDService.getBrowserConsole();