diff --git a/devtools/client/inspector/breadcrumbs.js b/devtools/client/inspector/breadcrumbs.js index bd4ddd68b8bc..a12f628bafc8 100644 --- a/devtools/client/inspector/breadcrumbs.js +++ b/devtools/client/inspector/breadcrumbs.js @@ -22,10 +22,8 @@ const MAX_LABEL_LENGTH = 40; const NS_XHTML = "http://www.w3.org/1999/xhtml"; const SCROLL_REPEAT_MS = 100; -loader.lazyRequireGetter(this, "EventEmitter", - "devtools/shared/event-emitter"); -loader.lazyRequireGetter(this, "KeyShortcuts", - "devtools/client/shared/key-shortcuts", true); +const EventEmitter = require("devtools/shared/event-emitter"); +const {KeyShortcuts} = require("devtools/client/shared/key-shortcuts"); /** * Component to replicate functionality of XUL arrowscrollbox diff --git a/devtools/client/inspector/computed/computed.js b/devtools/client/inspector/computed/computed.js index 11b168d8f00d..72bef36da94d 100644 --- a/devtools/client/inspector/computed/computed.js +++ b/devtools/client/inspector/computed/computed.js @@ -27,14 +27,10 @@ const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm"); /* eslint-enable mozilla/reject-some-requires */ const {getCssProperties} = require("devtools/shared/fronts/css-properties"); -loader.lazyRequireGetter(this, "overlays", - "devtools/client/inspector/shared/style-inspector-overlays"); -loader.lazyRequireGetter(this, "StyleInspectorMenu", - "devtools/client/inspector/shared/style-inspector-menu"); -loader.lazyRequireGetter(this, "KeyShortcuts", - "devtools/client/shared/key-shortcuts", true); -loader.lazyRequireGetter(this, "LayoutView", - "devtools/client/inspector/layout/layout", true); +const overlays = require("devtools/client/inspector/shared/style-inspector-overlays"); +const StyleInspectorMenu = require("devtools/client/inspector/shared/style-inspector-menu"); +const {KeyShortcuts} = require("devtools/client/shared/key-shortcuts"); +const {LayoutView} = require("devtools/client/inspector/layout/layout"); XPCOMUtils.defineLazyModuleGetter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); diff --git a/devtools/client/inspector/inspector-commands.js b/devtools/client/inspector/inspector-commands.js index c1f42945ce6b..73edb0a32641 100644 --- a/devtools/client/inspector/inspector-commands.js +++ b/devtools/client/inspector/inspector-commands.js @@ -5,7 +5,7 @@ "use strict"; const l10n = require("gcli/l10n"); -loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true); +const {gDevTools} = require("devtools/client/framework/devtools"); /* eslint-disable mozilla/reject-some-requires */ const {EyeDropper, HighlighterEnvironment} = require("devtools/server/actors/highlighters"); /* eslint-enable mozilla/reject-some-requires */ diff --git a/devtools/client/inspector/inspector-panel.js b/devtools/client/inspector/inspector-panel.js index b187b3dcbc2c..bacc5ae5cfa7 100644 --- a/devtools/client/inspector/inspector-panel.js +++ b/devtools/client/inspector/inspector-panel.js @@ -3,8 +3,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* Experimenting with 100 char long lines */ -/* eslint max-len: [2, 100, 2, {ignoreUrls: true, "ignorePattern": "\\s*require\\s*\\(|^\\s*loader\\.lazy|-\\*-"}] */ // eslint-disable-line "use strict"; @@ -27,17 +25,17 @@ const Telemetry = require("devtools/client/shared/telemetry"); const Menu = require("devtools/client/framework/menu"); const MenuItem = require("devtools/client/framework/menu-item"); -loader.lazyRequireGetter(this, "CSS", "CSS"); +const CSS = require("CSS"); -loader.lazyRequireGetter(this, "CommandUtils", "devtools/client/shared/developer-toolbar", true); -loader.lazyRequireGetter(this, "ComputedViewTool", "devtools/client/inspector/computed/computed", true); -loader.lazyRequireGetter(this, "FontInspector", "devtools/client/inspector/fonts/fonts", true); -loader.lazyRequireGetter(this, "HTMLBreadcrumbs", "devtools/client/inspector/breadcrumbs", true); -loader.lazyRequireGetter(this, "InspectorSearch", "devtools/client/inspector/inspector-search", true); -loader.lazyRequireGetter(this, "MarkupView", "devtools/client/inspector/markup/markup", true); -loader.lazyRequireGetter(this, "RuleViewTool", "devtools/client/inspector/rules/rules", true); -loader.lazyRequireGetter(this, "ToolSidebar", "devtools/client/inspector/toolsidebar", true); -loader.lazyRequireGetter(this, "ViewHelpers", "devtools/client/shared/widgets/view-helpers", true); +const {CommandUtils} = require("devtools/client/shared/developer-toolbar"); +const {ComputedViewTool} = require("devtools/client/inspector/computed/computed"); +const {FontInspector} = require("devtools/client/inspector/fonts/fonts"); +const {HTMLBreadcrumbs} = require("devtools/client/inspector/breadcrumbs"); +const {InspectorSearch} = require("devtools/client/inspector/inspector-search"); +const {MarkupView} = require("devtools/client/inspector/markup/markup"); +const {RuleViewTool} = require("devtools/client/inspector/rules/rules"); +const {ToolSidebar} = require("devtools/client/inspector/toolsidebar"); +const {ViewHelpers} = require("devtools/client/shared/widgets/view-helpers"); loader.lazyGetter(this, "strings", () => { return Services.strings.createBundle("chrome://devtools/locale/inspector.properties"); @@ -216,7 +214,8 @@ InspectorPanel.prototype = { // is selected. this.updateDebuggerPausedWarning = () => { let notificationBox = this._toolbox.getNotificationBox(); - let notification = notificationBox.getNotificationWithValue("inspector-script-paused"); + let notification = + notificationBox.getNotificationWithValue("inspector-script-paused"); if (!notification && this._toolbox.currentToolId == "inspector" && this._toolbox.threadClient.paused) { let message = strings.GetStringFromName("debuggerPausedWarning.message"); @@ -1517,9 +1516,12 @@ InspectorPanel.prototype = { }, /** - * Copy the content of a longString (via a promise resolving a LongStringActor) to the clipboard - * @param {Promise} longStringActorPromise promise expected to resolve a LongStringActor instance - * @return {Promise} promise resolving (with no argument) when the string is sent to the clipboard + * Copy the content of a longString (via a promise resolving a + * LongStringActor) to the clipboard + * @param {Promise} longStringActorPromise promise expected to + * resolve a LongStringActor instance + * @return {Promise} promise resolving (with no argument) when the + * string is sent to the clipboard */ _copyLongString: function (longStringActorPromise) { return this._getLongString(longStringActorPromise).then(string => { @@ -1529,7 +1531,8 @@ InspectorPanel.prototype = { /** * Retrieve the content of a longString (via a promise resolving a LongStringActor) - * @param {Promise} longStringActorPromise promise expected to resolve a LongStringActor instance + * @param {Promise} longStringActorPromise promise expected to + * resolve a LongStringActor instance * @return {Promise} promise resolving with the retrieved string as argument */ _getLongString: function (longStringActorPromise) { diff --git a/devtools/client/inspector/inspector-search.js b/devtools/client/inspector/inspector-search.js index 8e8929ba8a20..1639f1f828d0 100644 --- a/devtools/client/inspector/inspector-search.js +++ b/devtools/client/inspector/inspector-search.js @@ -10,9 +10,9 @@ const {Ci} = require("chrome"); const promise = require("promise"); const {Task} = require("devtools/shared/task"); -loader.lazyGetter(this, "system", () => require("devtools/shared/system")); -loader.lazyGetter(this, "EventEmitter", () => require("devtools/shared/event-emitter")); -loader.lazyGetter(this, "AutocompletePopup", () => require("devtools/client/shared/autocomplete-popup").AutocompletePopup); +const system = require("devtools/shared/system"); +const EventEmitter = require("devtools/shared/event-emitter"); +const {AutocompletePopup} = require("devtools/client/shared/autocomplete-popup"); // Maximum number of selector suggestions shown in the panel. const MAX_SUGGESTIONS = 15; diff --git a/devtools/client/inspector/markup/markup.js b/devtools/client/inspector/markup/markup.js index 4f50dda76a39..5782a1742a0d 100644 --- a/devtools/client/inspector/markup/markup.js +++ b/devtools/client/inspector/markup/markup.js @@ -61,10 +61,8 @@ const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm"); /* eslint-enable mozilla/reject-some-requires */ const {getCssProperties} = require("devtools/shared/fronts/css-properties"); -loader.lazyRequireGetter(this, "CSS", "CSS"); -loader.lazyGetter(this, "AutocompletePopup", () => { - return require("devtools/client/shared/autocomplete-popup").AutocompletePopup; -}); +const CSS = require("CSS"); +const {AutocompletePopup} = require("devtools/client/shared/autocomplete-popup"); XPCOMUtils.defineLazyModuleGetter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); diff --git a/devtools/client/inspector/rules/rules.js b/devtools/client/inspector/rules/rules.js index b4c63d148979..3ba6c3342451 100644 --- a/devtools/client/inspector/rules/rules.js +++ b/devtools/client/inspector/rules/rules.js @@ -29,14 +29,10 @@ const {createChild, promiseWarn, throttle} = require("devtools/client/inspector/ const {gDevTools} = require("devtools/client/framework/devtools"); const {getCssProperties} = require("devtools/shared/fronts/css-properties"); -loader.lazyRequireGetter(this, "overlays", - "devtools/client/inspector/shared/style-inspector-overlays"); -loader.lazyRequireGetter(this, "EventEmitter", - "devtools/shared/event-emitter"); -loader.lazyRequireGetter(this, "StyleInspectorMenu", - "devtools/client/inspector/shared/style-inspector-menu"); -loader.lazyRequireGetter(this, "KeyShortcuts", - "devtools/client/shared/key-shortcuts", true); +const overlays = require("devtools/client/inspector/shared/style-inspector-overlays"); +const EventEmitter = require("devtools/shared/event-emitter"); +const StyleInspectorMenu = require("devtools/client/inspector/shared/style-inspector-menu"); +const {KeyShortcuts} = require("devtools/client/shared/key-shortcuts"); XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function () { return Cc["@mozilla.org/widget/clipboardhelper;1"] @@ -48,9 +44,7 @@ XPCOMUtils.defineLazyGetter(this, "_strings", function () { "chrome://devtools-shared/locale/styleinspector.properties"); }); -loader.lazyGetter(this, "AutocompletePopup", function () { - return require("devtools/client/shared/autocomplete-popup").AutocompletePopup; -}); +const {AutocompletePopup} = require("devtools/client/shared/autocomplete-popup"); const HTML_NS = "http://www.w3.org/1999/xhtml"; const PREF_UA_STYLES = "devtools.inspector.showUserAgentStyles"; diff --git a/devtools/client/inspector/shared/style-inspector-menu.js b/devtools/client/inspector/shared/style-inspector-menu.js index 48de1c23f895..a73ab3dc645d 100644 --- a/devtools/client/inspector/shared/style-inspector-menu.js +++ b/devtools/client/inspector/shared/style-inspector-menu.js @@ -14,8 +14,7 @@ const {Task} = require("devtools/shared/task"); const Menu = require("devtools/client/framework/menu"); const MenuItem = require("devtools/client/framework/menu-item"); -loader.lazyRequireGetter(this, "overlays", - "devtools/client/inspector/shared/style-inspector-overlays"); +const overlays = require("devtools/client/inspector/shared/style-inspector-overlays"); loader.lazyServiceGetter(this, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", "nsIClipboardHelper"); loader.lazyGetter(this, "_strings", () => {