mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 17:55:50 +00:00
Bug 1273941 - replace uses of promise.defer in devtools/client/inspector; r=jryans
MozReview-Commit-ID: CBKDIFYL9Ij --HG-- extra : transplant_source : %F9%EF9%B2B%87%FA%A3%CD%9E7%80%B1N%A9%FE%96%1F%C3%94
This commit is contained in:
parent
abf6180c9f
commit
8033f9ff34
@ -14,6 +14,7 @@ const ToolDefinitions = require("devtools/client/definitions").Tools;
|
||||
const {CssLogic} = require("devtools/shared/inspector/css-logic");
|
||||
const {ELEMENT_STYLE} = require("devtools/shared/specs/styles");
|
||||
const promise = require("promise");
|
||||
const defer = require("devtools/shared/defer");
|
||||
const Services = require("Services");
|
||||
const {OutputParser} = require("devtools/client/shared/output-parser");
|
||||
const {PrefObserver, PREF_ORIG_SOURCES} = require("devtools/client/styleeditor/utils");
|
||||
@ -395,7 +396,7 @@ CssComputedView.prototype = {
|
||||
return this._createViewsPromise;
|
||||
}
|
||||
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
this._createViewsPromise = deferred.promise;
|
||||
|
||||
this.refreshSourceFilter();
|
||||
@ -475,7 +476,7 @@ CssComputedView.prototype = {
|
||||
// Reset zebra striping.
|
||||
this._darkStripe = true;
|
||||
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
this._refreshProcess = new UpdateProcess(
|
||||
this.styleWindow, this.propertyViews, {
|
||||
onItem: (propView) => {
|
||||
@ -1342,7 +1343,7 @@ SelectorView.prototype = {
|
||||
let showOrig = Services.prefs.getBoolPref(PREF_ORIG_SOURCES);
|
||||
|
||||
if (showOrig && rule.type !== ELEMENT_STYLE) {
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
|
||||
// set as this first so we show something while we're fetching
|
||||
this.source = CssLogic.shortSource(this.sheet) + ":" + rule.line;
|
||||
|
@ -69,7 +69,7 @@ function* checkToggleKeyBinding(win, key, rulesTable, inspector) {
|
||||
|
||||
function checkHelpLinkKeybinding(view) {
|
||||
info("Check that MDN link is opened on \"F1\"");
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
let propView = getFirstVisiblePropertyView(view);
|
||||
propView.mdnLinkClick = function () {
|
||||
|
@ -12,6 +12,7 @@ const {Cc, Ci} = require("chrome");
|
||||
|
||||
var Services = require("Services");
|
||||
var promise = require("promise");
|
||||
var defer = require("devtools/shared/defer");
|
||||
var EventEmitter = require("devtools/shared/event-emitter");
|
||||
var clipboard = require("sdk/clipboard");
|
||||
const {executeSoon} = require("devtools/shared/DevToolsUtils");
|
||||
@ -187,7 +188,7 @@ InspectorPanel.prototype = {
|
||||
},
|
||||
|
||||
_deferredOpen: function (defaultSelection) {
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
|
||||
this.walker.on("new-root", this.onNewRoot);
|
||||
|
||||
|
@ -34,6 +34,7 @@ const {editableField, InplaceEditor} =
|
||||
require("devtools/client/shared/inplace-editor");
|
||||
const {HTMLEditor} = require("devtools/client/inspector/markup/html-editor");
|
||||
const promise = require("promise");
|
||||
const defer = require("devtools/shared/defer");
|
||||
const Services = require("Services");
|
||||
const {HTMLTooltip} = require("devtools/client/shared/widgets/HTMLTooltip");
|
||||
const {setImageTooltip, setBrokenImageTooltip} =
|
||||
@ -425,7 +426,7 @@ MarkupView.prototype = {
|
||||
_brieflyShowBoxModel: function (nodeFront) {
|
||||
this._clearBriefBoxModelTimer();
|
||||
let onShown = this._showBoxModel(nodeFront);
|
||||
this._briefBoxModelPromise = promise.defer();
|
||||
this._briefBoxModelPromise = defer();
|
||||
|
||||
this._briefBoxModelTimer = setTimeout(() => {
|
||||
this._hideBoxModel()
|
||||
@ -1329,7 +1330,7 @@ MarkupView.prototype = {
|
||||
return promise.reject();
|
||||
}
|
||||
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
container.undo.do(() => {
|
||||
this.walker.setInnerHTML(node, newValue).then(def.resolve, def.reject);
|
||||
@ -1359,7 +1360,7 @@ MarkupView.prototype = {
|
||||
return promise.reject();
|
||||
}
|
||||
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
let injectedNodes = [];
|
||||
container.undo.do(() => {
|
||||
|
@ -48,7 +48,7 @@ function* assertCopyImageDataAvailable(inspector) {
|
||||
}
|
||||
|
||||
function triggerCopyImageUrlAndWaitForClipboard(expected, inspector) {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
SimpleTest.waitForClipboard(expected, () => {
|
||||
inspector.markup.getContainer(inspector.selection.nodeFront)
|
||||
|
@ -36,7 +36,7 @@ add_task(function* () {
|
||||
});
|
||||
|
||||
function registerTestActor(toolbox) {
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
|
||||
let options = {
|
||||
prefix: "eventsFormActor",
|
||||
|
@ -69,7 +69,7 @@ add_task(function* () {
|
||||
});
|
||||
|
||||
function waitForTabLoad(tab) {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
tab.addEventListener("load", function onLoad(e) {
|
||||
// Skip load event for about:blank
|
||||
if (tab.linkedBrowser.currentURI.spec === "about:blank") {
|
||||
|
@ -59,7 +59,7 @@ add_task(function* () {
|
||||
});
|
||||
|
||||
function waitForTabLoad(tab) {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
tab.addEventListener("load", function onLoad() {
|
||||
// Skip load event for about:blank
|
||||
if (tab.linkedBrowser.currentURI.spec === "about:blank") {
|
||||
|
@ -62,7 +62,7 @@ function* chooseWithInspectElementContextMenu(selector, testActor) {
|
||||
}
|
||||
|
||||
function waitForLinkedBrowserEvent(tab, event) {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
tab.linkedBrowser.addEventListener(event, function cb() {
|
||||
tab.linkedBrowser.removeEventListener(event, cb, true);
|
||||
def.resolve();
|
||||
|
@ -281,7 +281,7 @@ add_task(function* () {
|
||||
|
||||
// If a test expects more than one mutation it may come through in a single
|
||||
// event or possibly in multiples.
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
let seenMutations = 0;
|
||||
inspector.on("markupmutation", function onmutation(e, mutations) {
|
||||
seenMutations += mutations.length;
|
||||
|
@ -126,7 +126,7 @@ function* runTestData(inspector, testActor,
|
||||
"The container is marked as " + (before ? "shown" : "hidden"));
|
||||
|
||||
info("Listening for the display-change event");
|
||||
let onDisplayChanged = promise.defer();
|
||||
let onDisplayChanged = defer();
|
||||
inspector.markup.walker.once("display-change", onDisplayChanged.resolve);
|
||||
|
||||
info("Making style changes");
|
||||
|
@ -113,7 +113,7 @@ function* getFirstChildNodeValue(selector, testActor) {
|
||||
*/
|
||||
function waitForChildrenUpdated({markup}) {
|
||||
info("Waiting for queued children updates to be handled");
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
markup._waitForChildren().then(() => {
|
||||
executeSoon(def.resolve);
|
||||
});
|
||||
@ -278,7 +278,7 @@ function searchUsingSelectorSearch(selector, inspector) {
|
||||
* @return A promise that resolves when the time is passed
|
||||
*/
|
||||
function wait(ms) {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
setTimeout(def.resolve, ms);
|
||||
return def.promise;
|
||||
}
|
||||
@ -352,7 +352,7 @@ function* (nodeFront, inspector, assert = true) {
|
||||
* can be used with yield.
|
||||
*/
|
||||
function promiseNextTick() {
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
executeSoon(deferred.resolve);
|
||||
return deferred.promise;
|
||||
}
|
||||
@ -448,7 +448,7 @@ function createTestHTTPServer() {
|
||||
let server = new HttpServer();
|
||||
|
||||
registerCleanupFunction(function* cleanup() {
|
||||
let destroyed = promise.defer();
|
||||
let destroyed = defer();
|
||||
server.stop(() => {
|
||||
destroyed.resolve();
|
||||
});
|
||||
|
@ -9,6 +9,7 @@
|
||||
|
||||
const {Cc, Ci} = require("chrome");
|
||||
const promise = require("promise");
|
||||
const defer = require("devtools/shared/defer");
|
||||
const Services = require("Services");
|
||||
const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const {Task} = require("devtools/shared/task");
|
||||
@ -125,7 +126,7 @@ function createDummyDocument() {
|
||||
docShell.createAboutBlankContentViewer(nullPrincipal);
|
||||
let window = docShell.contentViewer.DOMDocument.defaultView;
|
||||
window.location = "data:text/html,<html></html>";
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
eventTarget.addEventListener("DOMContentLoaded", function handler() {
|
||||
eventTarget.removeEventListener("DOMContentLoaded", handler, false);
|
||||
deferred.resolve(window.document);
|
||||
|
@ -77,7 +77,7 @@ add_task(function* () {
|
||||
* not `state`.
|
||||
*/
|
||||
function* setBooleanPref(pref, state) {
|
||||
let oncePrefChanged = promise.defer();
|
||||
let oncePrefChanged = defer();
|
||||
let prefObserver = new PrefObserver("devtools.");
|
||||
prefObserver.on(pref, oncePrefChanged.resolve);
|
||||
|
||||
|
@ -76,7 +76,7 @@ add_task(function* () {
|
||||
});
|
||||
|
||||
function testESC(swatch, dropper) {
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
|
||||
dropper.once("destroy", () => {
|
||||
let color = swatch.style.backgroundColor;
|
||||
@ -129,7 +129,7 @@ function checkTelemetry() {
|
||||
/* Helpers */
|
||||
|
||||
function openEyedropper(view, swatch) {
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
|
||||
let tooltip = view.tooltips.colorPicker.tooltip;
|
||||
|
||||
|
@ -50,7 +50,7 @@ function* testClickingLink(toolbox, view) {
|
||||
}
|
||||
|
||||
function checkDisplayedStylesheet(toolbox) {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
let panel = toolbox.getCurrentPanel();
|
||||
panel.UI.on("editor-selected", (event, editor) => {
|
||||
|
@ -86,7 +86,7 @@ function* setUserAgentStylesPref(val) {
|
||||
|
||||
// Reset the pref and wait for PrefObserver to callback so UI
|
||||
// has a chance to get updated.
|
||||
let oncePrefChanged = promise.defer();
|
||||
let oncePrefChanged = defer();
|
||||
let prefObserver = new PrefObserver("devtools.");
|
||||
prefObserver.on(PREF_UA_STYLES, oncePrefChanged.resolve);
|
||||
Services.prefs.setBoolPref(PREF_UA_STYLES, val);
|
||||
|
@ -20,7 +20,7 @@ var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
|
||||
|
||||
var {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
|
||||
var {CssLogic} = require("devtools/shared/inspector/css-logic");
|
||||
var promise = require("promise");
|
||||
var defer = require("devtools/shared/defer");
|
||||
|
||||
/**
|
||||
* Get a value for a given property name in a css rule in a stylesheet, given
|
||||
@ -125,7 +125,7 @@ var dumpn = msg => dump(msg + "\n");
|
||||
* if the timeout is reached
|
||||
*/
|
||||
function waitForSuccess(validatorFn) {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
function wait(fn) {
|
||||
if (fn()) {
|
||||
|
@ -55,7 +55,7 @@ function waitForContentMessage(name) {
|
||||
|
||||
let mm = gBrowser.selectedBrowser.messageManager;
|
||||
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
mm.addMessageListener(name, function onMessage(msg) {
|
||||
mm.removeMessageListener(name, onMessage);
|
||||
def.resolve(msg.data);
|
||||
|
@ -20,7 +20,7 @@ var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
|
||||
|
||||
var {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
|
||||
var {CssLogic} = require("devtools/shared/inspector/css-logic");
|
||||
var promise = require("promise");
|
||||
var defer = require("devtools/shared/defer");
|
||||
|
||||
/**
|
||||
* Get a value for a given property name in a css rule in a stylesheet, given
|
||||
@ -128,7 +128,7 @@ var dumpn = msg => dump(msg + "\n");
|
||||
* if the timeout is reached
|
||||
*/
|
||||
function waitForSuccess(validatorFn, name = "untitled") {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
function wait(fn) {
|
||||
if (fn()) {
|
||||
|
@ -101,7 +101,7 @@ function waitForContentMessage(name) {
|
||||
|
||||
let mm = gBrowser.selectedBrowser.messageManager;
|
||||
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
mm.addMessageListener(name, function onMessage(msg) {
|
||||
mm.removeMessageListener(name, onMessage);
|
||||
def.resolve(msg.data);
|
||||
@ -214,7 +214,7 @@ var focusEditableField = Task.async(function* (ruleView, editable, xOffset = 1,
|
||||
* if the timeout is reached
|
||||
*/
|
||||
function waitForSuccess(validatorFn, name = "untitled") {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
function wait(validator) {
|
||||
if (validator()) {
|
||||
|
@ -33,7 +33,7 @@ add_task(function* () {
|
||||
});
|
||||
|
||||
function waitForTheBrieflyShowBoxModelTimeout() {
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
// Note that the current timeout is 1 sec and is neither configurable nor
|
||||
// exported anywhere we can access, so hard-coding the timeout
|
||||
setTimeout(deferred.resolve, 1500);
|
||||
|
@ -80,7 +80,7 @@ add_task(function* () {
|
||||
let deleteNode = allMenuItems.find(item => item.id === "node-menu-delete");
|
||||
deleteNode.click();
|
||||
|
||||
let deferred = promise.defer();
|
||||
let deferred = defer();
|
||||
executeSoon(deferred.resolve);
|
||||
yield deferred.promise;
|
||||
|
||||
|
@ -454,7 +454,7 @@ var clickContainer = Task.async(function* (selector, inspector) {
|
||||
*/
|
||||
function mouseLeaveMarkupView(inspector) {
|
||||
info("Leaving the markup-view area");
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
// Find another element to mouseover over in order to leave the markup-view
|
||||
let btn = inspector.toolbox.doc.querySelector("#toolbox-controls");
|
||||
@ -655,7 +655,7 @@ function* waitForMultipleChildrenUpdates(inspector) {
|
||||
*/
|
||||
function waitForChildrenUpdated({markup}) {
|
||||
info("Waiting for queued children updates to be handled");
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
markup._waitForChildren().then(() => {
|
||||
executeSoon(def.resolve);
|
||||
});
|
||||
@ -674,7 +674,7 @@ function waitForChildrenUpdated({markup}) {
|
||||
* ready
|
||||
*/
|
||||
function waitForStyleEditor(toolbox, href) {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
|
||||
info("Waiting for the toolbox to switch to the styleeditor");
|
||||
toolbox.once("styleeditor-selected").then(() => {
|
||||
@ -725,7 +725,7 @@ function waitForStyleEditor(toolbox, href) {
|
||||
* the validator function has returned true, rejects otherwise.
|
||||
*/
|
||||
function waitForClipboard(setup, expected) {
|
||||
let def = promise.defer();
|
||||
let def = defer();
|
||||
SimpleTest.waitForClipboard(expected, setup, def.resolve, def.reject);
|
||||
return def.promise;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user