forked from Floorp-Projects/Floorp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 455906: Support severities for blocklist entries. r=robstrong, r…
…=jst
- Loading branch information
Showing
33 changed files
with
1,401 additions
and
239 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <!ENTITY blocklist.title "Add-ons may be causing problems"> | ||
| <!ENTITY blocklist.style "width: 45em; height: 30em"> | ||
| <!ENTITY blocklist.summary "&brandShortName; has determined that the following add-ons are known to cause stability or security problems:"> | ||
| <!ENTITY blocklist.softblocked "For your protection, it is highly recommended that you restart with these add-ons disabled."> | ||
| <!ENTITY blocklist.hardblocked "These add-ons have a high risk of causing stability or security problems and have been blocked, but a restart is required to disable them completely."> | ||
| <!ENTITY blocklist.softandhard "The add-ons that have a high risk of causing stability or security problems have been blocked. The others are lower risk, but it is highly recommended that you restart with them disabled."> | ||
| <!ENTITY blocklist.moreinfo "More information"> | ||
|
|
||
| <!ENTITY blocklist.accept.label "Restart &brandShortName;"> | ||
| <!ENTITY blocklist.accept.accesskey "R"> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| hbox.addon-name-version { | ||
| -moz-binding: url("chrome://mozapps/content/extensions/extensions.xml#addon-name-version"); | ||
| } | ||
|
|
||
| .hardBlockedAddon { | ||
| -moz-binding: url("chrome://mozapps/content/extensions/extensions.xml#hardblockedaddon"); | ||
| } | ||
|
|
||
| .softBlockedAddon { | ||
| -moz-binding: url("chrome://mozapps/content/extensions/extensions.xml#softblockedaddon"); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| # ***** BEGIN LICENSE BLOCK ***** | ||
| # Version: MPL 1.1/GPL 2.0/LGPL 2.1 | ||
| # | ||
| # The contents of this file are subject to the Mozilla Public License Version | ||
| # 1.1 (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # http://www.mozilla.org/MPL/ | ||
| # | ||
| # Software distributed under the License is distributed on an "AS IS" basis, | ||
| # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | ||
| # for the specific language governing rights and limitations under the | ||
| # License. | ||
| # | ||
| # The Original Code is the Extension Blocklist UI. | ||
| # | ||
| # The Initial Developer of the Original Code is | ||
| # Mozilla Corporation | ||
| # Portions created by the Initial Developer are Copyright (C) 2008 | ||
| # the Initial Developer. All Rights Reserved. | ||
| # | ||
| # Contributor(s): | ||
| # Dave Townsend <dtownsend@oxymoronical.com> | ||
| # | ||
| # Alternatively, the contents of this file may be used under the terms of | ||
| # either the GNU General Public License Version 2 or later (the "GPL"), or | ||
| # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), | ||
| # in which case the provisions of the GPL or the LGPL are applicable instead | ||
| # of those above. If you wish to allow use of your version of this file only | ||
| # under the terms of either the GPL or the LGPL, and not to allow others to | ||
| # use your version of this file under the terms of the MPL, indicate your | ||
| # decision by deleting the provisions above and replace them with the notice | ||
| # and other provisions required by the GPL or the LGPL. If you do not delete | ||
| # the provisions above, a recipient may use your version of this file under | ||
| # the terms of any one of the MPL, the GPL or the LGPL. | ||
| # | ||
| # ***** END LICENSE BLOCK ***** | ||
|
|
||
| var gArgs; | ||
|
|
||
| function init() { | ||
| var hasHardBlocks = false; | ||
| var hasSoftBlocks = false; | ||
| gArgs = window.arguments[0].wrappedJSObject; | ||
|
|
||
| var richlist = document.getElementById("addonList"); | ||
| var list = gArgs.list; | ||
| list.sort(function(a, b) { return String.localeCompare(a.name, b.name); }); | ||
| for (let i = 0; i < list.length; i++) { | ||
| let item = document.createElement("richlistitem"); | ||
| item.setAttribute("name", list[i].name); | ||
| item.setAttribute("version", list[i].version); | ||
| item.setAttribute("icon", list[i].icon); | ||
| if (list[i].blocked) { | ||
| item.setAttribute("class", "hardBlockedAddon"); | ||
| hasHardBlocks = true; | ||
| } | ||
| else { | ||
| item.setAttribute("class", "softBlockedAddon"); | ||
| hasSoftBlocks = true; | ||
| } | ||
| richlist.appendChild(item); | ||
| } | ||
|
|
||
| if (hasHardBlocks && hasSoftBlocks) | ||
| document.getElementById("bothMessage").hidden = false; | ||
| else if (hasHardBlocks) | ||
| document.getElementById("hardBlockMessage").hidden = false; | ||
| else | ||
| document.getElementById("softBlockMessage").hidden = false; | ||
| } | ||
|
|
||
| function accept() { | ||
| gArgs.restart = true; | ||
| var list = gArgs.list; | ||
| var items = document.getElementById("addonList").childNodes; | ||
| for (let i = 0; i < list.length; i++) { | ||
| if (!list[i].blocked) | ||
| list[i].disable = items[i].checked; | ||
| } | ||
| return true; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| <?xml version="1.0"?> | ||
| # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
| # ***** BEGIN LICENSE BLOCK ***** | ||
| # Version: MPL 1.1/GPL 2.0/LGPL 2.1 | ||
| # | ||
| # The contents of this file are subject to the Mozilla Public License Version | ||
| # 1.1 (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # http://www.mozilla.org/MPL/ | ||
| # | ||
| # Software distributed under the License is distributed on an "AS IS" basis, | ||
| # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | ||
| # for the specific language governing rights and limitations under the | ||
| # License. | ||
| # | ||
| # The Original Code is the Extension List UI. | ||
| # | ||
| # The Initial Developer of the Original Code is Google Inc. | ||
| # Portions created by the Initial Developer are Copyright (C) 2005 | ||
| # the Initial Developer. All Rights Reserved. | ||
| # | ||
| # Contributor(s): | ||
| # Ben Goodger <ben@mozilla.org> | ||
| # Robert Strong <robert.bugzilla@gmail.com> | ||
| # Dave Townsend <dtownsend@oxymoronical.com> | ||
| # | ||
| # Alternatively, the contents of this file may be used under the terms of | ||
| # either the GNU General Public License Version 2 or later (the "GPL"), or | ||
| # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), | ||
| # in which case the provisions of the GPL or the LGPL are applicable instead | ||
| # of those above. If you wish to allow use of your version of this file only | ||
| # under the terms of either the GPL or the LGPL, and not to allow others to | ||
| # use your version of this file under the terms of the MPL, indicate your | ||
| # decision by deleting the provisions above and replace them with the notice | ||
| # and other provisions required by the GPL or the LGPL. If you do not delete | ||
| # the provisions above, a recipient may use your version of this file under | ||
| # the terms of any one of the MPL, the GPL or the LGPL. | ||
| # | ||
| # ***** END LICENSE BLOCK ***** | ||
| <?xml-stylesheet href="chrome://global/skin/"?> | ||
| <?xml-stylesheet href="chrome://mozapps/skin/extensions/blocklist.css"?> | ||
| <?xml-stylesheet href="chrome://mozapps/content/extensions/blocklist.css"?> | ||
|
|
||
| <!DOCTYPE dialog [ | ||
| <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> | ||
| %brandDTD; | ||
| <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/blocklist.dtd"> | ||
| %extensionsDTD; | ||
| ]> | ||
|
|
||
| <dialog windowtype="Addons:Blocklist" title="&blocklist.title;" align="stretch" | ||
| xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" | ||
| onload="init();" ondialogaccept="return accept()" | ||
| buttons="accept,cancel" style="&blocklist.style;" | ||
| buttonlabelaccept="&blocklist.accept.label;" | ||
| buttonaccesskeyaccept="&blocklist.accept.accesskey;"> | ||
|
|
||
| <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/> | ||
| <script type="application/javascript" src="chrome://mozapps/content/extensions/blocklist.js"/> | ||
|
|
||
| <hbox align="stretch" flex="1"> | ||
| <vbox pack="start"> | ||
| <image class="error-icon"/> | ||
| </vbox> | ||
| <vbox flex="1"> | ||
| <label>&blocklist.summary;</label> | ||
| <separator class="thin"/> | ||
| <richlistbox id="addonList" flex="1"/> | ||
| <separator class="thin"/> | ||
| <description id="bothMessage" hidden="true" class="bold">&blocklist.softandhard;</description> | ||
| <description id="hardBlockMessage" hidden="true" class="bold">&blocklist.hardblocked;</description> | ||
| <description id="softBlockMessage" hidden="true" class="bold">&blocklist.softblocked;</description> | ||
| <hbox pack="start"> | ||
| <label class="text-link" value="&blocklist.moreinfo;"/> | ||
| </hbox> | ||
| </vbox> | ||
| </hbox> | ||
| </dialog> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.