Merge branch 'master' of https://github.com/MoonchildProductions/UXP into html_input_datetime_1

3 files changed, 58 insertions, 17 deletions

diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 9c15902b5..fab340540 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -1307,14 +1307,6 @@
               this._errorLink.value = gStrings.ext.GetStringFromName("notification.blocked.link");
               this._errorLink.href = this.mAddon.blocklistURL;
               this._errorLink.hidden = false;
-            } else if (this.mAddon.jetsdk) {
-              this.setAttribute("notification", "warning");
-              this._warning.textContent = gStrings.ext.formatStringFromName(
-                "notification.jetsdk",
-                [gStrings.brandShortName, gStrings.appVersion], 2
-              );
-              this._warningLink.hidden = true;
-              this._warningBtn.hidden = true;
             } else if ((!isUpgrade && !this.mAddon.isCompatible) && (AddonManager.checkCompatibility
             || (this.mAddon.blocklistState != Ci.nsIBlocklistService.STATE_SOFTBLOCKED))) {
               this.setAttribute("notification", "warning");
diff --git a/toolkit/mozapps/extensions/content/selectAddons.js b/toolkit/mozapps/extensions/content/selectAddons.js
index 33ab8a84e..f80932b3f 100644
--- a/toolkit/mozapps/extensions/content/selectAddons.js
+++ b/toolkit/mozapps/extensions/content/selectAddons.js
@@ -123,7 +123,11 @@ var gChecking = {
     if (this._completeCount < this._addonCount)
       return;
 
-    var addons = [gAddons[id] for (id in gAddons)];
+    // Tycho: var addons = [gAddons[id] for (id in gAddons)];
+    var addons = [];
+    for (let id in gAddons) {
+      addons.push(gAddons[id])
+    }
 
     addons.sort(function sortAddons(a, b) {
       let orderA = orderForScope(a.addon.scope);
diff --git a/toolkit/mozapps/extensions/content/update.js b/toolkit/mozapps/extensions/content/update.js
index 4e44b4f5e..3d87f4d4b 100644
--- a/toolkit/mozapps/extensions/content/update.js
+++ b/toolkit/mozapps/extensions/content/update.js
@@ -131,7 +131,13 @@ var gUpdateWizard = {
     if (gMismatchPage.waiting) {
       logger.info("Dialog closed in mismatch page");
       if (gUpdateWizard.addonInstalls.size > 0) {
-        gInstallingPage.startInstalls([i for ([, i] of gUpdateWizard.addonInstalls)]);
+        // Tycho: gInstallingPage.startInstalls([i for ([, i] of gUpdateWizard.addonInstalls)]);
+        let results = [];
+        for (let [, i] of gUpdateWizard.addonInstalls) {
+          results.push(i);
+        }
+
+        gInstallingPage.startInstalls(results);
       }
       return true;
     }
@@ -196,7 +202,13 @@ var gVersionInfoPage = {
       }
     }
     // Fetch the add-ons that are still affected by this update.
-    let idlist = [id for (id of gUpdateWizard.affectedAddonIDs)];
+    // Tycho: let idlist = [id for (id of gUpdateWizard.affectedAddonIDs)];
+
+    let idlist = [];
+    for (let id of gUpdateWizard.affectedAddonIDs) {
+      idlist.push(id);
+    }
+
     if (idlist.length < 1) {
       gVersionInfoPage.onAllUpdatesFinished();
       return;
@@ -206,7 +218,16 @@ var gVersionInfoPage = {
     let fetchedAddons = yield new Promise((resolve, reject) =>
       AddonManager.getAddonsByIDs(idlist, resolve));
     // We shouldn't get nulls here, but let's be paranoid...
-    gUpdateWizard.addons = [a for (a of fetchedAddons) if (a)];
+    // Tycho: gUpdateWizard.addons = [a for (a of fetchedAddons) if (a)];
+    let results = [];
+    for (let a of fetchedAddons) {
+      if (a) {
+        results.push(a);
+      }
+    }
+
+    gUpdateWizard.addons = results;
+
     if (gUpdateWizard.addons.length < 1) {
       gVersionInfoPage.onAllUpdatesFinished();
       return;
@@ -234,8 +255,18 @@ var gVersionInfoPage = {
     AddonManagerPrivate.recordSimpleMeasure("appUpdate_upgradeFailed", 0);
     AddonManagerPrivate.recordSimpleMeasure("appUpdate_upgradeDeclined", 0);
     // Filter out any add-ons that are now enabled.
-    logger.debug("VersionInfo updates finished: found " +
-         [addon.id + ":" + addon.appDisabled for (addon of gUpdateWizard.addons)].toSource());
+    // Tycho:
+    // logger.debug("VersionInfo updates finished: found " +
+    //      [addon.id + ":" + addon.appDisabled for (addon of gUpdateWizard.addons)].toSource());
+    
+    let logDisabledAddons = [];
+    for (let addon of gUpdateWizard.addons) {
+      if (addon.appDisabled) {
+        logDisabledAddons.push(addon.id + ":" + addon.appDisabled);
+      }
+    }
+    logger.debug("VersionInfo updates finished: found " + logDisabledAddons.toSource());
+
     let filteredAddons = [];
     for (let a of gUpdateWizard.addons) {
       if (a.appDisabled) {
@@ -252,7 +283,13 @@ var gVersionInfoPage = {
     if (gUpdateWizard.shuttingDown) {
       // jump directly to updating auto-update add-ons in the background
       if (gUpdateWizard.addonInstalls.size > 0) {
-        gInstallingPage.startInstalls([i for ([, i] of gUpdateWizard.addonInstalls)]);
+        // Tycho: gInstallingPage.startInstalls([i for ([, i] of gUpdateWizard.addonInstalls)]);
+        let results = [];
+        for (let [, i] of gUpdateWizard.addonInstalls) {
+          results.push(i);
+        }
+
+        gInstallingPage.startInstalls(results);
       }
       return;
     }
@@ -478,8 +515,16 @@ var gInstallingPage = {
       return;
     }
 
-    logger.debug("Start installs for "
-                 + [i.existingAddon.id for (i of aInstallList)].toSource());
+    // Tycho:
+    // logger.debug("Start installs for "
+    //             + [i.existingAddon.id for (i of aInstallList)].toSource());
+
+    let logInstallAddons = [];
+    for (let i of aInstallList) {
+      logInstallAddons.push(i.existingAddon.id);
+    }
+    logger.debug("Start installs for " + logInstallAddons.toSource());
+
     this._errors = [];
     this._installs = aInstallList;
     this._installing = true;