From 43d44975b1f49df640916cca5f6a0b138696da3c Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 13 Feb 2019 19:11:37 +0100 Subject: Remove WebExtension support from the platform. - Conditional code - WE APIs - WE toolkit theming --- toolkit/mozapps/extensions/content/newaddon.js | 13 ------------- toolkit/mozapps/extensions/jar.mn | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'toolkit/mozapps') diff --git a/toolkit/mozapps/extensions/content/newaddon.js b/toolkit/mozapps/extensions/content/newaddon.js index 79978a698..aab556a62 100644 --- a/toolkit/mozapps/extensions/content/newaddon.js +++ b/toolkit/mozapps/extensions/content/newaddon.js @@ -43,9 +43,6 @@ function initialize() { // 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 || -#ifdef MOZ_WEBEXTENSIONS - aAddon.seen || -#endif !(aAddon.permissions & AddonManager.PERM_CAN_ENABLE)) { window.close(); return; @@ -82,16 +79,6 @@ 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(); - } - else { - document.addEventListener("focus", () => aAddon.markAsSeen(), false); - } -#endif - var event = document.createEvent("Events"); event.initEvent("AddonDisplayed", true, true); document.dispatchEvent(event); diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/extensions/jar.mn index c4d8874c9..e95d93ca0 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) -- cgit v1.2.3