summaryrefslogtreecommitdiffstats
path: root/toolkit/mozapps/extensions
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-05-01 12:26:01 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-05-01 12:26:01 -0400
commit61de1c80cdc6c04e71fde07cc5028af503438134 (patch)
treee158c4bcd756e65deb2635acb503be4c07b56e75 /toolkit/mozapps/extensions
parent754796d243fe9cd1a6d26fde4135ccb5d00a0415 (diff)
downloadUXP-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')
-rw-r--r--toolkit/mozapps/extensions/content/extensions.xml6
-rw-r--r--toolkit/mozapps/extensions/internal/XPIProvider.jsm8
-rw-r--r--toolkit/mozapps/extensions/internal/XPIProviderUtils.js6
3 files changed, 16 insertions, 4 deletions
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index fab340540..7fe17be2a 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -9,6 +9,8 @@
%extensionsDTD;
<!ENTITY % aboutDTD SYSTEM "chrome://mozapps/locale/extensions/about.dtd">
%aboutDTD;
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+%brandDTD;
]>
<bindings id="addonBindings"
@@ -855,8 +857,10 @@
<xul:label anonid="name" class="name" crop="end" flex="1"
xbl:inherits="value=name,tooltiptext=name"/>
<xul:label anonid="version" class="version"/>
+#ifdef MOZ_PHOENIX_EXTENSIONS
<xul:label class="nativeIndicator nativeAddon" value="●" tooltiptext="&addon.nativeAddon;"/>
<xul:label class="nativeIndicator compatAddon" value="●" tooltiptext="&addon.compatAddon;"/>
+#endif
<xul:label class="disabled-postfix" value="&addon.disabled.postfix;"/>
<xul:label class="update-postfix" value="&addon.update.postfix;"/>
<xul:spacer flex="5000"/> <!-- Necessary to make the name crop -->
@@ -1362,8 +1366,10 @@
[this.mAddon.name], 1);
} else {
this.removeAttribute("notification");
+#ifdef MOZ_PHOENIX_EXTENSIONS
if (this.mAddon.type == "extension")
this.setAttribute("native", this.mAddon.native);
+#endif
}
}
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;