diff options
Diffstat (limited to 'toolkit/mozapps/webextensions')
4 files changed, 17 insertions, 21 deletions
diff --git a/toolkit/mozapps/webextensions/content/extensions.js b/toolkit/mozapps/webextensions/content/extensions.js index 56158d9c6..5e428fe17 100644 --- a/toolkit/mozapps/webextensions/content/extensions.js +++ b/toolkit/mozapps/webextensions/content/extensions.js @@ -2744,12 +2744,8 @@ var gListView = { document.getElementById("signing-dev-info").hidden = true; } - if (Preferences.get("plugin.load_flash_only", true)) { - document.getElementById("plugindeprecation-learnmore-link") - .setAttribute("href", Services.urlFormatter.formatURLPref("app.support.baseURL") + "npapi"); - } else { - document.getElementById("plugindeprecation-notice").hidden = true; - } + // To-Do: remove deprecation notice content. + document.getElementById("plugindeprecation-notice").hidden = true; }, show: function(aType, aRequest) { diff --git a/toolkit/mozapps/webextensions/jar.mn b/toolkit/mozapps/webextensions/jar.mn index ecf64b7ef..77cbf32eb 100644 --- a/toolkit/mozapps/webextensions/jar.mn +++ b/toolkit/mozapps/webextensions/jar.mn @@ -7,7 +7,7 @@ toolkit.jar: % content mozapps %content/mozapps/ * content/mozapps/extensions/extensions.xul (content/extensions.xul) content/mozapps/extensions/extensions.css (content/extensions.css) - content/mozapps/extensions/extensions.js (content/extensions.js) +* content/mozapps/extensions/extensions.js (content/extensions.js) * content/mozapps/extensions/extensions.xml (content/extensions.xml) content/mozapps/extensions/updateinfo.xsl (content/updateinfo.xsl) content/mozapps/extensions/about.xul (content/about.xul) diff --git a/toolkit/mozapps/webextensions/test/browser/browser-window.ini b/toolkit/mozapps/webextensions/test/browser/browser-window.ini index fcda90fc6..ca9353d21 100644 --- a/toolkit/mozapps/webextensions/test/browser/browser-window.ini +++ b/toolkit/mozapps/webextensions/test/browser/browser-window.ini @@ -41,12 +41,12 @@ support-files = webapi_checkchromeframe.xul webapi_checkframed.html webapi_checknavigatedwindow.html - !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi - !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi - !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html - !/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi - !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi - !/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi - !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html + !/toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/theme.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi [include:browser-common.ini] diff --git a/toolkit/mozapps/webextensions/test/browser/browser.ini b/toolkit/mozapps/webextensions/test/browser/browser.ini index a23841d33..8a144baba 100644 --- a/toolkit/mozapps/webextensions/test/browser/browser.ini +++ b/toolkit/mozapps/webextensions/test/browser/browser.ini @@ -41,13 +41,13 @@ support-files = webapi_checkchromeframe.xul webapi_checkframed.html webapi_checknavigatedwindow.html - !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi - !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi - !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html - !/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi - !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi - !/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi - !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html + !/toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/theme.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi [browser_addonrepository_performance.js] [browser_bug557956.js] |