Bug 1193313 - Remove projecteditor promise alias in favor of require(promise). r=bgrins

browser/devtools/projecteditor/chrome/content/projecteditor-loader.js

@@ -2,7 +2,7 @@ const Cu = Components.utils;
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
 const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm", {});
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const ProjectEditor = require("projecteditor/projecteditor");
 
 const SAMPLE_PATH = buildTempDirectoryStructure();

browser/devtools/projecteditor/lib/editors.js

@@ -8,7 +8,7 @@ const { Cu } = require("chrome");
 const { Class } = require("sdk/core/heritage");
 const { EventTarget } = require("sdk/event/target");
 const { emit } = require("sdk/event/core");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const Editor  = require("devtools/sourceeditor/editor");
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";

browser/devtools/projecteditor/lib/helpers/file-picker.js

@@ -11,7 +11,7 @@
 
 const { Cu, Cc, Ci } = require("chrome");
 const { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm", {});
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { merge } = require("sdk/util/object");
 const { getLocalizedString } = require("projecteditor/helpers/l10n");
 

browser/devtools/projecteditor/lib/helpers/promise.js

@@ -1,11 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* 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/. */
-
-/**
- * This helper is a quick way to require() the Promise object from Promise.jsm.
- */
-const { Cu } = require("chrome");
-module.exports = require("promise");

browser/devtools/projecteditor/lib/plugins/app-manager/app-project-editor.js

@@ -6,7 +6,7 @@
 
 const { Cu } = require("chrome");
 const { Class } = require("sdk/core/heritage");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { ItchEditor } = require("projecteditor/editors");
 
 var AppProjectEditor = Class({

browser/devtools/projecteditor/lib/plugins/app-manager/plugin.js

@@ -2,7 +2,7 @@ const { Cu } = require("chrome");
 const { Class } = require("sdk/core/heritage");
 const { EventTarget } = require("sdk/event/target");
 const { emit } = require("sdk/event/core");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 var { registerPlugin, Plugin } = require("projecteditor/plugins/core");
 const { AppProjectEditor } = require("./app-project-editor");
 const OPTION_URL = "chrome://browser/skin/devtools/tool-options.svg";

browser/devtools/projecteditor/lib/plugins/image-view/image-editor.js

@@ -6,7 +6,7 @@
 
 const { Cu } = require("chrome");
 const { Class } = require("sdk/core/heritage");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { ItchEditor } = require("projecteditor/editors");
 
 var ImageEditor = Class({

browser/devtools/projecteditor/lib/plugins/image-view/plugin.js

@@ -6,7 +6,7 @@
 
 const { Cu } = require("chrome");
 const { Class } = require("sdk/core/heritage");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { ImageEditor } = require("./image-editor");
 const { registerPlugin, Plugin } = require("projecteditor/plugins/core");
 

browser/devtools/projecteditor/lib/plugins/status-bar/plugin.js

@@ -6,7 +6,7 @@
 
 const { Cu } = require("chrome");
 const { Class } = require("sdk/core/heritage");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { registerPlugin, Plugin } = require("projecteditor/plugins/core");
 
 /**

browser/devtools/projecteditor/lib/project.js

@@ -13,7 +13,7 @@ const prefs = require("sdk/preferences/service");
 const { LocalStore } = require("projecteditor/stores/local");
 const { OS } = Cu.import("resource://gre/modules/osfile.jsm", {});
 const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { TextEncoder, TextDecoder } = require('sdk/io/buffer');
 const url = require('sdk/url');
 

browser/devtools/projecteditor/lib/projecteditor.js

@@ -15,7 +15,7 @@ const { EventTarget } = require("sdk/event/target");
 const { on, forget } = require("projecteditor/helpers/event");
 const { emit } = require("sdk/event/core");
 const { merge } = require("sdk/util/object");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { ViewHelpers } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {});
 const { DOMHelpers } = Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
 const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});

browser/devtools/projecteditor/lib/stores/base.js

@@ -8,7 +8,7 @@ const { Cc, Ci, Cu } = require("chrome");
 const { Class } = require("sdk/core/heritage");
 const { EventTarget } = require("sdk/event/target");
 const { emit } = require("sdk/event/core");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 
 /**
  * A Store object maintains a collection of Resource objects stored in a tree.

browser/devtools/projecteditor/lib/stores/local.js

@@ -10,7 +10,7 @@ const { OS } = Cu.import("resource://gre/modules/osfile.jsm", {});
 const { emit } = require("sdk/event/core");
 const { Store } = require("projecteditor/stores/base");
 const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { on, forget } = require("projecteditor/helpers/event");
 const { FileResource } = require("projecteditor/stores/resource");
 const {Services} = Cu.import("resource://gre/modules/Services.jsm");

browser/devtools/projecteditor/lib/stores/resource.js

@@ -12,7 +12,7 @@ const { Class } = require("sdk/core/heritage");
 const { EventTarget } = require("sdk/event/target");
 const { emit } = require("sdk/event/core");
 const URL = require("sdk/url");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { OS } = Cu.import("resource://gre/modules/osfile.jsm", {});
 const { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm", {});
 const mimeService = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService);

browser/devtools/projecteditor/lib/tree.js

@@ -9,7 +9,7 @@ const { Class } = require("sdk/core/heritage");
 const { emit } = require("sdk/event/core");
 const { EventTarget } = require("sdk/event/target");
 const { merge } = require("sdk/util/object");
-const promise = require("projecteditor/helpers/promise");
+const promise = require("promise");
 const { InplaceEditor } = require("devtools/shared/inplace-editor");
 const { on, forget } = require("projecteditor/helpers/event");
 const { OS } = Cu.import("resource://gre/modules/osfile.jsm", {});

browser/devtools/projecteditor/moz.build

@@ -18,7 +18,6 @@ EXTRA_JS_MODULES.devtools.projecteditor.helpers += [
     'lib/helpers/event.js',
     'lib/helpers/file-picker.js',
     'lib/helpers/l10n.js',
-    'lib/helpers/promise.js',
     'lib/helpers/prompts.js',
     'lib/helpers/readdir.js',
 ]