From f2bfc943417ec6274bd7c5261fa4d910dded72c8 Mon Sep 17 00:00:00 2001 From: Alexandre Poirot Date: Wed, 13 Sep 2017 14:33:58 +0200 Subject: [PATCH] Bug 1399449 - Convert devtools/client/responsivedesign/responsivedesign.jsm to a commonjs module. r=jryans MozReview-Commit-ID: Jl6OGUWnbHN --HG-- rename : devtools/client/responsivedesign/responsivedesign.jsm => devtools/client/responsivedesign/responsivedesign.js extra : rebase_source : 329c364fc4c256273b0d02a8119637aed428134c --- .eslintignore | 1 - browser/base/content/browser.js | 6 ------ devtools/bootstrap.js | 1 - devtools/client/definitions.js | 2 +- devtools/client/framework/devtools-browser.js | 2 +- devtools/client/menus.js | 2 +- devtools/client/responsive.html/test/browser/head.js | 2 +- devtools/client/responsivedesign/moz.build | 2 +- devtools/client/responsivedesign/resize-commands.js | 2 +- .../{responsivedesign.jsm => responsivedesign.js} | 9 ++------- devtools/client/responsivedesign/test/head.js | 2 +- .../shared/test/browser_telemetry_button_responsive.js | 2 +- devtools/client/styleeditor/StyleEditorUI.jsm | 6 +++--- .../test/browser_styleeditor_media_sidebar_links.js | 4 ++-- tools/lint/eslint/modules.json | 1 - 15 files changed, 15 insertions(+), 29 deletions(-) rename devtools/client/responsivedesign/{responsivedesign.jsm => responsivedesign.js} (77%) diff --git a/.eslintignore b/.eslintignore index fcfa99953ba2..75e561ff24ff 100644 --- a/.eslintignore +++ b/.eslintignore @@ -97,7 +97,6 @@ devtools/client/performance/components/test/test_jit_optimizations_01.html devtools/client/projecteditor/** devtools/client/responsive.html/test/browser/touch.html devtools/client/responsivedesign/** -!devtools/client/responsivedesign/responsivedesign.jsm devtools/client/scratchpad/** devtools/client/shadereditor/** devtools/client/shared/*.jsm diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 867c198c1fb5..e072c2f839a0 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -8508,12 +8508,6 @@ var ResponsiveUI = { } }; -XPCOMUtils.defineLazyGetter(ResponsiveUI, "ResponsiveUIManager", function() { - let tmp = {}; - Cu.import("resource://devtools/client/responsivedesign/responsivedesign.jsm", tmp); - return tmp.ResponsiveUIManager; -}); - var MousePosTracker = { _listeners: new Set(), _x: 0, diff --git a/devtools/bootstrap.js b/devtools/bootstrap.js index a0005a2282bd..a328304240fc 100644 --- a/devtools/bootstrap.js +++ b/devtools/bootstrap.js @@ -210,7 +210,6 @@ function unload(reason) { Cu.unload("resource://devtools/shared/Parser.jsm"); Cu.unload("resource://devtools/client/shared/DOMHelpers.jsm"); Cu.unload("resource://devtools/client/shared/widgets/VariablesView.jsm"); - Cu.unload("resource://devtools/client/responsivedesign/responsivedesign.jsm"); Cu.unload("resource://devtools/client/shared/widgets/AbstractTreeItem.jsm"); Cu.unload("resource://devtools/shared/deprecated-sync-thenables.js"); } diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js index 364e58a8868c..cfd9cfcb0d64 100644 --- a/devtools/client/definitions.js +++ b/devtools/client/definitions.js @@ -27,7 +27,7 @@ loader.lazyGetter(this, "DomPanel", () => require("devtools/client/dom/dom-panel // Other dependencies loader.lazyRequireGetter(this, "CommandUtils", "devtools/client/shared/developer-toolbar", true); loader.lazyRequireGetter(this, "CommandState", "devtools/shared/gcli/command-state", true); -loader.lazyImporter(this, "ResponsiveUIManager", "resource://devtools/client/responsivedesign/responsivedesign.jsm"); +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign"); loader.lazyImporter(this, "ScratchpadManager", "resource://devtools/client/scratchpad/scratchpad-manager.jsm"); const {MultiLocalizationHelper} = require("devtools/shared/l10n"); diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js index d7b524de8768..9f0e15869dc4 100644 --- a/devtools/client/framework/devtools-browser.js +++ b/devtools/client/framework/devtools-browser.js @@ -25,8 +25,8 @@ loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main", loader.lazyRequireGetter(this, "BrowserMenus", "devtools/client/framework/browser-menus"); loader.lazyRequireGetter(this, "appendStyleSheet", "devtools/client/shared/stylesheet-utils", true); loader.lazyRequireGetter(this, "DeveloperToolbar", "devtools/client/shared/developer-toolbar", true); +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign"); loader.lazyImporter(this, "BrowserToolboxProcess", "resource://devtools/client/framework/ToolboxProcess.jsm"); -loader.lazyImporter(this, "ResponsiveUIManager", "resource://devtools/client/responsivedesign/responsivedesign.jsm"); loader.lazyImporter(this, "ScratchpadManager", "resource://devtools/client/scratchpad/scratchpad-manager.jsm"); loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm"); diff --git a/devtools/client/menus.js b/devtools/client/menus.js index ebc4515086ef..ab6f2465dde1 100644 --- a/devtools/client/menus.js +++ b/devtools/client/menus.js @@ -31,9 +31,9 @@ loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true); loader.lazyRequireGetter(this, "CommandUtils", "devtools/client/shared/developer-toolbar", true); loader.lazyRequireGetter(this, "TargetFactory", "devtools/client/framework/target", true); +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign"); loader.lazyImporter(this, "BrowserToolboxProcess", "resource://devtools/client/framework/ToolboxProcess.jsm"); -loader.lazyImporter(this, "ResponsiveUIManager", "resource://devtools/client/responsivedesign/responsivedesign.jsm"); loader.lazyImporter(this, "ScratchpadManager", "resource://devtools/client/scratchpad/scratchpad-manager.jsm"); exports.menuitems = [ diff --git a/devtools/client/responsive.html/test/browser/head.js b/devtools/client/responsive.html/test/browser/head.js index 3baf207410cf..13473d49f62a 100644 --- a/devtools/client/responsive.html/test/browser/head.js +++ b/devtools/client/responsive.html/test/browser/head.js @@ -63,7 +63,7 @@ registerCleanupFunction(() => { }); // This depends on the "devtools.responsive.html.enabled" pref -const { ResponsiveUIManager } = require("resource://devtools/client/responsivedesign/responsivedesign.jsm"); +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign"); /** * Open responsive design mode for the given tab. diff --git a/devtools/client/responsivedesign/moz.build b/devtools/client/responsivedesign/moz.build index d59935b8369f..25c5c05fb91d 100644 --- a/devtools/client/responsivedesign/moz.build +++ b/devtools/client/responsivedesign/moz.build @@ -8,7 +8,7 @@ DevToolsModules( 'resize-commands.js', 'responsivedesign-child.js', 'responsivedesign-old.js', - 'responsivedesign.jsm', + 'responsivedesign.js', ) with Files('**'): diff --git a/devtools/client/responsivedesign/resize-commands.js b/devtools/client/responsivedesign/resize-commands.js index 824bb8aa7819..577cbdb28684 100644 --- a/devtools/client/responsivedesign/resize-commands.js +++ b/devtools/client/responsivedesign/resize-commands.js @@ -6,7 +6,7 @@ const { Cc, Ci, Cu } = require("chrome"); -loader.lazyImporter(this, "ResponsiveUIManager", "resource://devtools/client/responsivedesign/responsivedesign.jsm"); +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign"); const BRAND_SHORT_NAME = Cc["@mozilla.org/intl/stringbundle;1"]. getService(Ci.nsIStringBundleService). diff --git a/devtools/client/responsivedesign/responsivedesign.jsm b/devtools/client/responsivedesign/responsivedesign.js similarity index 77% rename from devtools/client/responsivedesign/responsivedesign.jsm rename to devtools/client/responsivedesign/responsivedesign.js index 8c3bdb94dfc1..080920626db4 100644 --- a/devtools/client/responsivedesign/responsivedesign.jsm +++ b/devtools/client/responsivedesign/responsivedesign.js @@ -4,15 +4,10 @@ "use strict"; -const Cu = Components.utils; - -const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {}); const Services = require("Services"); const NEW_RDM_ENABLED = "devtools.responsive.html.enabled"; -this.EXPORTED_SYMBOLS = ["ResponsiveUIManager"]; - // If the new HTML RDM UI is enabled and e10s is enabled by default (e10s is required for // the new HTML RDM UI to function), delegate the ResponsiveUIManager API over to that // tool instead. Performing this delegation here allows us to contain the pref check to a @@ -20,8 +15,8 @@ this.EXPORTED_SYMBOLS = ["ResponsiveUIManager"]; if (Services.prefs.getBoolPref(NEW_RDM_ENABLED) && Services.appinfo.browserTabsRemoteAutostart) { let { ResponsiveUIManager } = require("devtools/client/responsive.html/manager"); - this.ResponsiveUIManager = ResponsiveUIManager; + module.exports = ResponsiveUIManager; } else { let { ResponsiveUIManager } = require("devtools/client/responsivedesign/responsivedesign-old"); - this.ResponsiveUIManager = ResponsiveUIManager; + module.exports = ResponsiveUIManager; } diff --git a/devtools/client/responsivedesign/test/head.js b/devtools/client/responsivedesign/test/head.js index b36cd668f717..17b19974d95d 100644 --- a/devtools/client/responsivedesign/test/head.js +++ b/devtools/client/responsivedesign/test/head.js @@ -27,7 +27,7 @@ registerCleanupFunction(() => { SimpleTest.requestCompleteLog(); -const { ResponsiveUIManager } = Cu.import("resource://devtools/client/responsivedesign/responsivedesign.jsm", {}); +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign"); /** * Open the Responsive Design Mode diff --git a/devtools/client/shared/test/browser_telemetry_button_responsive.js b/devtools/client/shared/test/browser_telemetry_button_responsive.js index 41e53f0f8dce..aa2c22c35e6a 100644 --- a/devtools/client/shared/test/browser_telemetry_button_responsive.js +++ b/devtools/client/shared/test/browser_telemetry_button_responsive.js @@ -10,7 +10,7 @@ const TEST_URI = "data:text/html;charset=utf-8," + // opened we make use of setTimeout() to create tool active times. const TOOL_DELAY = 200; -const { ResponsiveUIManager } = Cu.import("resource://devtools/client/responsivedesign/responsivedesign.jsm", {}); +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign"); add_task(function* () { yield addTab(TEST_URI); diff --git a/devtools/client/styleeditor/StyleEditorUI.jsm b/devtools/client/styleeditor/StyleEditorUI.jsm index f9f700ebbe74..34125d31af9e 100644 --- a/devtools/client/styleeditor/StyleEditorUI.jsm +++ b/devtools/client/styleeditor/StyleEditorUI.jsm @@ -10,7 +10,7 @@ this.EXPORTED_SYMBOLS = ["StyleEditorUI"]; const Ci = Components.interfaces; const Cu = Components.utils; -const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {}); +const {loader, require} = Cu.import("resource://devtools/shared/Loader.jsm", {}); const Services = require("Services"); const {NetUtil} = require("resource://gre/modules/NetUtil.jsm"); const {OS} = require("resource://gre/modules/osfile.jsm"); @@ -29,10 +29,10 @@ const {PluralForm} = require("devtools/shared/plural-form"); const {PrefObserver} = require("devtools/client/shared/prefs"); const csscoverage = require("devtools/shared/fronts/csscoverage"); const {console} = require("resource://gre/modules/Console.jsm"); -const {ResponsiveUIManager} = - require("resource://devtools/client/responsivedesign/responsivedesign.jsm"); const {KeyCodes} = require("devtools/client/shared/keycodes"); +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign"); + const LOAD_ERROR = "error-load"; const STYLE_EDITOR_TEMPLATE = "stylesheet"; const SELECTOR_HIGHLIGHTER_TYPE = "SelectorHighlighter"; diff --git a/devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_links.js b/devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_links.js index 85c41b9dc334..607f49436155 100644 --- a/devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_links.js +++ b/devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_links.js @@ -16,8 +16,8 @@ registerCleanupFunction(() => { asyncStorage.removeItem("devtools.devices.url_cache"); }); -const mgr = "resource://devtools/client/responsivedesign/responsivedesign.jsm"; -const {ResponsiveUIManager} = Cu.import(mgr, {}); +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign"); + const TESTCASE_URI = TEST_BASE_HTTPS + "media-rules.html"; const responsiveModeToggleClass = ".media-responsive-mode-toggle"; diff --git a/tools/lint/eslint/modules.json b/tools/lint/eslint/modules.json index 174cd714b623..96dd5f8ab154 100644 --- a/tools/lint/eslint/modules.json +++ b/tools/lint/eslint/modules.json @@ -185,7 +185,6 @@ "RemotePageManager.jsm": ["RemotePages", "RemotePageManager", "PageListener"], "RemoteWebProgress.jsm": ["RemoteWebProgressManager"], "resource.js": ["AsyncResource", "Resource"], - "responsivedesign.jsm": ["ResponsiveUIManager"], "rest.js": ["RESTRequest", "RESTResponse", "TokenAuthenticatedRESTRequest", "SyncStorageRequest"], "rotaryengine.js": ["RotaryEngine", "RotaryRecord", "RotaryStore", "RotaryTracker"], "require.js": ["require"],