diff options
Diffstat (limited to 'toolkit/mozapps')
-rw-r--r-- | toolkit/mozapps/extensions/content/extensions.xml | 8 | ||||
-rw-r--r-- | toolkit/mozapps/extensions/internal/XPIProvider.jsm | 23 | ||||
-rw-r--r-- | toolkit/mozapps/extensions/internal/XPIProviderUtils.js | 2 |
3 files changed, 3 insertions, 30 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/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 975448fcc..54b86edc4 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -635,9 +635,6 @@ function isUsableAddon(aAddon) { if (aAddon.type == "theme" && aAddon.internalName == XPIProvider.defaultSkin) return true; - if (aAddon.jetsdk) - return false; - if (aAddon.blocklistState == Blocklist.STATE_BLOCKED) return false; @@ -1116,23 +1113,7 @@ function loadManifestFromZipReader(aZipReader) { } else { addon.hasBinaryComponents = false; } - - // Set a boolean value whether the .xpi archive contains file related to old - // Mozilla Add-on SDK or contains file related to PMkit (or new Mozilla SDK), - // but extension is not directly targeting Pale Moon - if (aZipReader.hasEntry("harness-options.json")) { - addon.jetsdk = true; - } else if (aZipReader.hasEntry("package.json")) { - let app = addon.matchingTargetApplication; - if (app && app.id == Services.appinfo.ID) { - addon.jetsdk = false; - } else { - addon.jetsdk = true; - } - } else { - addon.jetsdk = false; - } - + addon.appDisabled = !isUsableAddon(addon); return addon; } @@ -6731,7 +6712,7 @@ function AddonWrapper(aAddon) { "providesUpdatesSecurely", "blocklistState", "blocklistURL", "appDisabled", "softDisabled", "skinnable", "size", "foreignInstall", "hasBinaryComponents", "strictCompatibility", "compatibilityOverrides", "updateURL", - "getDataDirectory", "multiprocessCompatible", "jetsdk", "native"].forEach(function(aProp) { + "getDataDirectory", "multiprocessCompatible", "native"].forEach(function(aProp) { this.__defineGetter__(aProp, function AddonWrapper_propertyGetter() aAddon[aProp]); }, this); diff --git a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js index d4798b726..2cef907f1 100644 --- a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js +++ b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js @@ -70,7 +70,7 @@ const PROP_JSON_FIELDS = ["id", "syncGUID", "location", "version", "type", "skinnable", "size", "sourceURI", "releaseNotesURI", "softDisabled", "foreignInstall", "hasBinaryComponents", "strictCompatibility", "locales", "targetApplications", - "targetPlatforms", "multiprocessCompatible", "jetsdk", "native"]; + "targetPlatforms", "multiprocessCompatible", "native"]; // Time to wait before async save of XPI JSON database, in milliseconds const ASYNC_SAVE_DELAY_MS = 20; |