nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1399449 - Convert devtools/client/responsivedesign/responsivedesign.jsm to a commonjs module. r=jryans

Browse source 
MozReview-Commit-ID: Jl6OGUWnbHN

--HG--
rename : devtools/client/responsivedesign/responsivedesign.jsm => devtools/client/responsivedesign/responsivedesign.js
extra : rebase_source : 329c364fc4c256273b0d02a8119637aed428134c
This commit is contained in:
Alexandre Poirot 2017-09-13 14:33:58 +02:00
parent 297207d530
commit f2bfc94341
15 changed files with 15 additions and 29 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintignore
View file

@ -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

6
browser/base/content/browser.js
View file

@ -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,

1
devtools/bootstrap.js vendored
View file

@ -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");
}

2
devtools/client/definitions.js
View file

@ -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");

2
devtools/client/framework/devtools-browser.js
View file

@ -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");

2
devtools/client/menus.js
View file

@ -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 = [

2
devtools/client/responsive.html/test/browser/head.js
View file

@ -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.

2
devtools/client/responsivedesign/moz.build
View file

@ -8,7 +8,7 @@ DevToolsModules(
'resize-commands.js',
'responsivedesign-child.js',
'responsivedesign-old.js',
'responsivedesign.jsm',
'responsivedesign.js',
)
with Files('**'):

2
devtools/client/responsivedesign/resize-commands.js
View file

@ -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).

9
devtools/client/responsivedesign/responsivedesign.jsm → devtools/client/responsivedesign/responsivedesign.js
View file

@ -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;
}

2
devtools/client/responsivedesign/test/head.js
View file

@ -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

2
devtools/client/shared/test/browser_telemetry_button_responsive.js
View file

@ -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);

6
devtools/client/styleeditor/StyleEditorUI.jsm
View file

@ -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";

4
devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_links.js
View file

@ -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";

1
tools/lint/eslint/modules.json
View file

@ -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"],