Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1196714 - Use require(promise) instead of require(sdk/core/promise). r=jryans

Browse Source
This commit is contained in:
Alexandre Poirot 2015-08-26 06:05:14 -07:00
parent 83daf03db3
commit 07f8c2ffaf
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/devtools/netmonitor/har/har-automation.js
View File

@ -5,7 +5,7 @@
const { Cu, Ci, Cc } = require("chrome");
const { Class } = require("sdk/core/heritage");
const { defer, resolve } = require("sdk/core/promise");
const { defer, resolve } = require("promise");
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
Cu.import("resource://gre/modules/Task.jsm");

2
browser/devtools/netmonitor/har/har-builder.js
View File

@ -4,7 +4,7 @@
"use strict";
const { Cu, Ci, Cc } = require("chrome");
const { defer, all, resolve } = require("sdk/core/promise");
const { defer, all, resolve } = require("promise");
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
loader.lazyImporter(this, "ViewHelpers", "resource:///modules/devtools/ViewHelpers.jsm");

2
browser/devtools/netmonitor/har/har-collector.js
View File

@ -4,7 +4,7 @@
"use strict";
const { Cu, Ci, Cc } = require("chrome");
const { defer, all } = require("sdk/core/promise");
const { defer, all } = require("promise");
const { setTimeout, clearTimeout } = require("sdk/timers");
const { makeInfallible } = require("devtools/toolkit/DevToolsUtils.js");

2
browser/devtools/netmonitor/har/har-exporter.js
View File

@ -5,7 +5,7 @@
const { Cu, Cc, Ci } = require("chrome");
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
const { defer, resolve } = require("sdk/core/promise");
const { defer, resolve } = require("promise");
const { HarUtils } = require("./har-utils.js");
const { HarBuilder } = require("./har-builder.js");

2
browser/devtools/projecteditor/test/head.js
View File

@ -6,7 +6,7 @@ const Cu = Components.utils;
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {TargetFactory} = require("devtools/framework/target");
const {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
const promise = require("sdk/core/promise");
const promise = require("promise");
const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm", {});
const ProjectEditor = require("projecteditor/projecteditor");

2
browser/devtools/shared/poller.js
View File

@ -6,7 +6,7 @@
loader.lazyRequireGetter(this, "timers",
"resource://gre/modules/Timer.jsm");
loader.lazyRequireGetter(this, "defer",
"sdk/core/promise", true);
"promise", true);
/**
* @constructor Poller

2
browser/devtools/shared/test/head.js
View File

@ -8,7 +8,7 @@ let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
const {DOMHelpers} = Cu.import("resource:///modules/devtools/DOMHelpers.jsm", {});
const {Hosts} = require("devtools/framework/toolbox-hosts");
const {defer} = require("sdk/core/promise");
const {defer} = require("promise");
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
DevToolsUtils.testing = true;

2
toolkit/devtools/server/tests/browser/head.js
View File

@ -11,7 +11,7 @@ const {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {DebuggerClient} = require("devtools/toolkit/client/main");
const {DebuggerServer} = require("devtools/server/main");
const {defer} = require("sdk/core/promise");
const {defer} = require("promise");
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
const PATH = "browser/toolkit/devtools/server/tests/browser/";