[AllAM] De-duplicate blocklist.js, list.js, newaddon.js, and xpinstallConfirm.js

1 files changed, 14 insertions, 6 deletions

diff --git a/toolkit/mozapps/extensions/content/newaddon.js b/toolkit/mozapps/extensions/content/newaddon.js
index e45b3c1cc..b1ad5631b 100644
--- a/toolkit/mozapps/extensions/content/newaddon.js
+++ b/toolkit/mozapps/extensions/content/newaddon.js
@@ -13,7 +13,7 @@ var gAddon = null;
 
 // If the user enables the add-on through some other UI close this window
 var EnableListener = {
-  onEnabling: function EnableListener_onEnabling(aAddon) {
+  onEnabling: function(aAddon) {
     if (aAddon.id == gAddon.id)
       window.close();
   }
@@ -38,11 +38,11 @@ function initialize() {
 
   let bundle = Services.strings.createBundle("chrome://mozapps/locale/extensions/newaddon.properties");
 
-  AddonManager.getAddonByID(id, function initialize_getAddonByID(aAddon) {
-    // If the add-on doesn't exist or it is already enabled 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 ||
+  AddonManager.getAddonByID(id, function(aAddon) {
+    // 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 ||
         !(aAddon.permissions & AddonManager.PERM_CAN_ENABLE)) {
       window.close();
       return;
@@ -79,6 +79,14 @@ function initialize() {
       document.getElementById("location").hidden = true;
     }
 
+    // Only mark the add-on as seen if the page actually gets focus
+    if (document.hasFocus()) {
+      aAddon.markAsSeen();
+    }
+    else {
+      document.addEventListener("focus", () => aAddon.markAsSeen(), false);
+    }
+
     var event = document.createEvent("Events");
     event.initEvent("AddonDisplayed", true, true);
     document.dispatchEvent(event);