diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-05-01 12:26:01 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-05-01 12:26:01 -0400 |
| commit | 61de1c80cdc6c04e71fde07cc5028af503438134 (patch) | |
| tree | e158c4bcd756e65deb2635acb503be4c07b56e75 /toolkit/mozapps/extensions/internal | |
| parent | 754796d243fe9cd1a6d26fde4135ccb5d00a0415 (diff) | |
| download | UXP-61de1c80cdc6c04e71fde07cc5028af503438134.tar UXP-61de1c80cdc6c04e71fde07cc5028af503438134.tar.gz UXP-61de1c80cdc6c04e71fde07cc5028af503438134.tar.lz UXP-61de1c80cdc6c04e71fde07cc5028af503438134.tar.xz UXP-61de1c80cdc6c04e71fde07cc5028af503438134.zip | |
Only set and show the dual-guid indicators when dual-guid has been built
Diffstat (limited to 'toolkit/mozapps/extensions/internal')
| -rw-r--r-- | toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 | ||||
| -rw-r--r-- | toolkit/mozapps/extensions/internal/XPIProviderUtils.js | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 8b49c6600..e1883fb6a 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -6442,21 +6442,23 @@ AddonInternal.prototype = { if (!aPlatformVersion) aPlatformVersion = Services.appinfo.platformVersion; +#ifdef MOZ_PHOENIX_EXTENSIONS this.native = false; - +#endif + let version; if (app.id == Services.appinfo.ID) { version = aAppVersion; +#ifdef MOZ_PHOENIX_EXTENSIONS this.native = true; } -#ifdef MOZ_PHOENIX_EXTENSIONS else if (app.id == FIREFOX_ID) { version = FIREFOX_APPCOMPATVERSION; if (this.type == "locale") //Never allow language packs in Firefox compatibility mode return false; - } #endif + } else if (app.id == TOOLKIT_ID) version = aPlatformVersion diff --git a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js index d26029455..6b37ed640 100644 --- a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js +++ b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js @@ -70,7 +70,11 @@ const PROP_JSON_FIELDS = ["id", "syncGUID", "location", "version", "type", "skinnable", "size", "sourceURI", "releaseNotesURI", "softDisabled", "foreignInstall", "hasBinaryComponents", "strictCompatibility", "locales", "targetApplications", - "targetPlatforms", "multiprocessCompatible", "native"]; + "targetPlatforms", "multiprocessCompatible", +#ifdef MOZ_PHOENIX_EXTENSIONS + "native" +#endif + ]; // Time to wait before async save of XPI JSON database, in milliseconds const ASYNC_SAVE_DELAY_MS = 20; |