summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-07-13 14:03:34 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-07-13 14:03:34 -0400
commit1862bf7a35db66ce232ca5adde9bd7c71d669e1e (patch)
tree502c9c9b26db4ab88f44ce5c5f0b74b7357908e4
parent97331d37719b3a7ee2e2d2bca70a3d2137f7155c (diff)
downloadUXP-1862bf7a35db66ce232ca5adde9bd7c71d669e1e.tar
UXP-1862bf7a35db66ce232ca5adde9bd7c71d669e1e.tar.gz
UXP-1862bf7a35db66ce232ca5adde9bd7c71d669e1e.tar.lz
UXP-1862bf7a35db66ce232ca5adde9bd7c71d669e1e.tar.xz
UXP-1862bf7a35db66ce232ca5adde9bd7c71d669e1e.zip
Issue #634 - aAddon.markAsSeen is not a function newaddon.js
-rw-r--r--toolkit/mozapps/extensions/content/newaddon.js7
-rw-r--r--toolkit/mozapps/extensions/jar.mn2
-rw-r--r--toolkit/mozapps/webextensions/jar.mn2
3 files changed, 8 insertions, 3 deletions
diff --git a/toolkit/mozapps/extensions/content/newaddon.js b/toolkit/mozapps/extensions/content/newaddon.js
index b1ad5631b..79978a698 100644
--- a/toolkit/mozapps/extensions/content/newaddon.js
+++ b/toolkit/mozapps/extensions/content/newaddon.js
@@ -42,7 +42,10 @@ function initialize() {
// If the add-on doesn't exist or it is already enabled or it has already
// been seen or it cannot be enabled then this UI is useless, just close it.
// This shouldn't normally happen unless session restore restores the tab.
- if (!aAddon || !aAddon.userDisabled || aAddon.seen ||
+ if (!aAddon || !aAddon.userDisabled ||
+#ifdef MOZ_WEBEXTENSIONS
+ aAddon.seen ||
+#endif
!(aAddon.permissions & AddonManager.PERM_CAN_ENABLE)) {
window.close();
return;
@@ -79,6 +82,7 @@ function initialize() {
document.getElementById("location").hidden = true;
}
+#ifdef MOZ_WEBEXTENSIONS
// Only mark the add-on as seen if the page actually gets focus
if (document.hasFocus()) {
aAddon.markAsSeen();
@@ -86,6 +90,7 @@ function initialize() {
else {
document.addEventListener("focus", () => aAddon.markAsSeen(), false);
}
+#endif
var event = document.createEvent("Events");
event.initEvent("AddonDisplayed", true, true);
diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/extensions/jar.mn
index e95d93ca0..c4d8874c9 100644
--- a/toolkit/mozapps/extensions/jar.mn
+++ b/toolkit/mozapps/extensions/jar.mn
@@ -26,7 +26,7 @@ toolkit.jar:
content/mozapps/extensions/eula.xul (content/eula.xul)
content/mozapps/extensions/eula.js (content/eula.js)
content/mozapps/extensions/newaddon.xul (content/newaddon.xul)
- content/mozapps/extensions/newaddon.js (content/newaddon.js)
+* content/mozapps/extensions/newaddon.js (content/newaddon.js)
content/mozapps/extensions/setting.xml (content/setting.xml)
content/mozapps/extensions/pluginPrefs.xul (content/pluginPrefs.xul)
content/mozapps/extensions/gmpPrefs.xul (content/gmpPrefs.xul)
diff --git a/toolkit/mozapps/webextensions/jar.mn b/toolkit/mozapps/webextensions/jar.mn
index ad3c45710..0c63396cc 100644
--- a/toolkit/mozapps/webextensions/jar.mn
+++ b/toolkit/mozapps/webextensions/jar.mn
@@ -23,7 +23,7 @@ toolkit.jar:
content/mozapps/extensions/eula.xul (../extensions/content/eula.xul)
content/mozapps/extensions/eula.js (content/eula.js)
content/mozapps/extensions/newaddon.xul (content/newaddon.xul)
- content/mozapps/extensions/newaddon.js (../extensions/content/newaddon.js)
+* content/mozapps/extensions/newaddon.js (../extensions/content/newaddon.js)
content/mozapps/extensions/pluginPrefs.xul (../extensions/content/pluginPrefs.xul)
content/mozapps/extensions/gmpPrefs.xul (../extensions/content/gmpPrefs.xul)
content/mozapps/extensions/OpenH264-license.txt (../extensions/content/OpenH264-license.txt)