Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 563168: Blocklist service warns of bad add-ons, but nothing is listed. r=robstrong

Browse Source
This commit is contained in:
Dave Townsend 2010-05-06 12:57:58 -07:00
parent 8ebdf6fb67
commit 2116288d38
5 changed files with 103 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd
View File

@ -8,3 +8,6 @@
<!ENTITY blocklist.accept.label "Restart &brandShortName;">
<!ENTITY blocklist.accept.accesskey "R">
<!ENTITY blocklist.blocked.label "Blocked">
<!ENTITY blocklist.checkbox.label "Disable">

8
toolkit/mozapps/extensions/content/blocklist.css
View File

@ -1,11 +1,7 @@
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");
-moz-binding: url("chrome://mozapps/content/extensions/blocklist.xml#hardblockedaddon");
}
.softBlockedAddon {
-moz-binding: url("chrome://mozapps/content/extensions/extensions.xml#softblockedaddon");
-moz-binding: url("chrome://mozapps/content/extensions/blocklist.xml#softblockedaddon");
}

93
toolkit/mozapps/extensions/content/blocklist.xml Normal file
View File

@ -0,0 +1,93 @@
<?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 Manager.
#
# The Initial Developer of the Original Code is
# the Mozilla Foundation
# Portions created by the Initial Developer are Copyright (C) 2010
# 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 *****
<!DOCTYPE bindings [
<!ENTITY % blocklistDTD SYSTEM "chrome://mozapps/locale/extensions/blocklist.dtd" >
%blocklistDTD;
]>
<bindings id="blocklistBindings"
xmlns="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="hardblockedaddon">
<content align="start">
<xul:image xbl:inherits="src=icon"/>
<xul:vbox flex="1">
<xul:hbox class="addon-name-version">
<xul:label class="addonName" crop="end" xbl:inherits="value=name"/>
<xul:label class="addonVersion" xbl:inherits="value=version"/>
</xul:hbox>
<xul:hbox>
<xul:spacer flex="1"/>
<xul:label class="blockedLabel" value="&blocklist.blocked.label;"/>
</xul:hbox>
</xul:vbox>
</content>
</binding>
<binding id="softblockedaddon">
<content align="start">
<xul:image xbl:inherits="src=icon"/>
<xul:vbox flex="1">
<xul:hbox class="addon-name-version">
<xul:label class="addonName" crop="end" xbl:inherits="value=name"/>
<xul:label class="addonVersion" xbl:inherits="value=version"/>
</xul:hbox>
<xul:hbox>
<xul:spacer flex="1"/>
<xul:checkbox class="disableCheckbox" checked="true" label="&blocklist.checkbox.label;"/>
</xul:hbox>
</xul:vbox>
</content>
<implementation>
<field name="_checkbox">
document.getAnonymousElementByAttribute(this, "class", "disableCheckbox")
</field>
<property name="checked" readonly="true">
<getter>
return this._checkbox.checked;
</getter>
</property>
</implementation>
</binding>
</bindings>

1
toolkit/mozapps/extensions/jar.mn
View File

@ -12,6 +12,7 @@ toolkit.jar:
* content/mozapps/extensions/blocklist.xul (content/blocklist.xul)
* content/mozapps/extensions/blocklist.js (content/blocklist.js)
* content/mozapps/extensions/blocklist.css (content/blocklist.css)
* content/mozapps/extensions/blocklist.xml (content/blocklist.xml)
* content/mozapps/extensions/errors.xul (content/errors.xul)
* content/mozapps/extensions/update.xul (content/update.xul)
* content/mozapps/extensions/update.js (content/update.js)

5
toolkit/mozapps/extensions/nsBlocklistService.js
View File

@ -790,7 +790,8 @@ Blocklist.prototype = {
oldAddonEntries);
let state = self.getAddonBlocklistState(addons[i].id, addons[i].version);
LOG("Blocklist state for " + addons[i].id + " changed from " + oldState + " to " + state);
LOG("Blocklist state for " + addons[i].id + " changed from " +
oldState + " to " + state);
// Don't warn about add-ons becoming unblocked.
if (state == 0)
@ -834,6 +835,8 @@ Blocklist.prototype = {
if (oldPluginEntries)
oldState = self._getPluginBlocklistState(plugins[i], oldPluginEntries);
let state = self.getPluginBlocklistState(plugins[i]);
LOG("Blocklist state for " + plugins[i].name + " changed from " +
oldState + " to " + state);
// We don't want to re-warn about items
if (state == oldState)
continue;