Bug 1114752 - Uplift Add-on SDK to Firefox a=me

addon-sdk/source/lib/sdk/preferences/utils.js

@@ -8,20 +8,17 @@ module.metadata = {
 };
 
 const { openTab, getBrowserForTab, getTabId } = require("sdk/tabs/utils");
-const { defer, all } = require("sdk/core/promise");
 const { on, off } = require("sdk/system/events");
-const { setTimeout } = require("sdk/timers");
 const { getMostRecentBrowserWindow } = require('../window/utils');
 
-const open = function open({ id }) {
-  let showing = defer();
-  let loaded = defer();
-  let result = { id: id };
-  let tab = openTab(getMostRecentBrowserWindow(), "about:addons", {
-    inBackground: true
-  });
+// Opens about:addons in a new tab, then displays the inline
+// preferences of the provided add-on
+const open = ({ id }) => new Promise((resolve, reject) => {
+  // opening the about:addons page in a new tab
+  let tab = openTab(getMostRecentBrowserWindow(), "about:addons");
   let browser = getBrowserForTab(tab);
 
+  // waiting for the about:addons page to load
   browser.addEventListener("load", function onPageLoad() {
     browser.removeEventListener("load", onPageLoad, true);
     let window = browser.contentWindow;
@@ -30,21 +27,16 @@ const open = function open({ id }) {
     on("addon-options-displayed", function onPrefDisplayed({ subject: doc, data }) {
       if (data === id) {
         off("addon-options-displayed", onPrefDisplayed);
-        result.tabId = getTabId(tab);
-        result.document = doc;
-        loaded.resolve();
+        resolve({
+          id: id,
+          tabId: getTabId(tab),
+          "document": doc
+        });
       }
     }, true);
 
     // display the add-on inline preferences page
     window.gViewController.commands.cmd_showItemDetails.doCommand({ id: id }, true);
-    let { node } = window.gViewController.viewObjects.detail;
-    node.addEventListener("ViewChanged", function whenViewChanges() {
-      node.removeEventListener("ViewChanged", whenViewChanges, false);
-      showing.resolve();
-    }, false);
   }, true);
-
-  return all([ showing.promise, loaded.promise ]).then(_ => result);
-}
+});
 exports.open = open;