[Pkg-mozext-commits] [cookie-monster] 01/10: Imported Upstream version 1.2.0
David Prévot
taffit at moszumanska.debian.org
Sun Apr 13 19:58:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository cookie-monster.
commit 08a8e2788b745a1272a94743f86668723e084c43
Author: David Prévot <taffit at debian.org>
Date: Sun Apr 13 15:02:14 2014 -0400
Imported Upstream version 1.2.0
---
chrome/cookiemonster.jar!/content/cookieInfo.js | 14 +-
chrome/cookiemonster.jar!/content/cookieMonster.js | 368 ++++++++++++++-------
chrome/cookiemonster.jar!/content/cookieRequest.js | 15 +-
chrome/cookiemonster.jar!/content/cookieUtils.js | 4 +-
chrome/cookiemonster.jar!/content/cookies.js | 4 +-
chrome/cookiemonster.jar!/content/options.xul | 2 +
chrome/cookiemonster.jar!/content/overlay.js | 20 +-
chrome/cookiemonster.jar!/content/overlay.xul | 2 +-
.../cookiemonster.jar!/content/overlay_toolbar.xul | 185 ++++++-----
chrome/cookiemonster.jar!/locale/de-DE/options.dtd | 1 +
chrome/cookiemonster.jar!/locale/en-US/options.dtd | 1 +
chrome/cookiemonster.jar!/locale/fr-FR/options.dtd | 1 +
chrome/cookiemonster.jar!/locale/it-IT/options.dtd | 1 +
chrome/cookiemonster.jar!/locale/nl-NL/options.dtd | 1 +
chrome/cookiemonster.jar!/locale/ru-RU/options.dtd | 1 +
chrome/cookiemonster.jar!/locale/zh-TW/options.dtd | 1 +
.../skin/cookie-monster-logo_old.png | Bin 0 -> 602 bytes
defaults/preferences/defaults.js | 2 +
install.rdf | 4 +-
19 files changed, 390 insertions(+), 237 deletions(-)
diff --git a/chrome/cookiemonster.jar!/content/cookieInfo.js b/chrome/cookiemonster.jar!/content/cookieInfo.js
index ebc2fb8..fef190f 100644
--- a/chrome/cookiemonster.jar!/content/cookieInfo.js
+++ b/chrome/cookiemonster.jar!/content/cookieInfo.js
@@ -426,15 +426,20 @@ s1tony.CM.cookieInfo =
var checkSpecialTwo = /^au|^uk|^tw|^br/i;
var newHostString = null;
- // Is the effective-tld-service available
- if (this._isEffectiveTLDService)
+ // First check if IPv6
+ if (aHost.split(":").length > 1)
+ {
+ // We're probably ipv6
+ newHostString = "["+ aHost +"]";
+ }
+ else if (this._isEffectiveTLDService)
{
+ // Is the effective-tld-service available
try
{
var eTLDService = Components.classes["@mozilla.org/network/effective-tld-service;1"]
.getService(Components.interfaces.nsIEffectiveTLDService);
- //alert("Test TLDService: " + eTLDService.getBaseDomain(cookieMonster._oldURL));
newHostString = eTLDService.getBaseDomainFromHost(aHost);
}
catch(e)
@@ -479,8 +484,7 @@ s1tony.CM.cookieInfo =
newHostString = aHost;
}
}
-
- //alert("Old Host: " + aHost + " New Host: " + newHostString);
+
return newHostString;
},
diff --git a/chrome/cookiemonster.jar!/content/cookieMonster.js b/chrome/cookiemonster.jar!/content/cookieMonster.js
index cb23313..adf1ece 100644
--- a/chrome/cookiemonster.jar!/content/cookieMonster.js
+++ b/chrome/cookiemonster.jar!/content/cookieMonster.js
@@ -1,7 +1,7 @@
// cookieMonster.js
// Tony Schilling
// Created: 01/20/2007
-// Last Updated: 09/04/2011
+// Last Updated: 03/16/2014
// Use XPCOM to detect browser tab changes and
// interface to the cookie manager and the
@@ -178,19 +178,209 @@ s1tony.CM.tabProgressListener =
onLinkIconAvailable: function() {return 0;}
};
+s1tony.CM.customizableUIListener =
+{
+ onWidgetAfterDOMChange: function(aNode, aNextNode, aContainer, aWasRemoval)
+ {
+ if (aNode.id === "cookiemonster-status")
+ {
+ s1tony.CM.cookieMonsterButton.checkButtonClick();
+ //console.log("onWidgetAfterDOMChange - node: " + aNode.id + ", aContainer: " + aContainer.id);
+ }
+ }
+};
+
+s1tony.CM.cookieMonsterButton =
+{
+ _elementId: null,
+ _element: null,
+ _cmReference: null,
+ _currentIcon: null,
+ _currentPopupId: null,
+
+ /**
+ * Initialize this object
+ */
+ init: function(cmReference, elementId)
+ {
+ this._cmReference = cmReference;
+ this._elementId = elementId;
+
+ // Determine if Australis
+ if (document.getElementById("PanelUI-menu-button"))
+ {
+ var cmButtonLocation = CustomizableUI.getPlacementOfWidget(this._elementId);
+ CustomizableUI.addListener(s1tony.CM.customizableUIListener);
+ console.log("Firefox running Australis");
+
+ if (cmButtonLocation)
+ {
+ this._element = document.getElementById(this._elementId);
+ }
+ else if (!s1tony.CM.nsPreferences.getBoolPref("firstRunDone", false))
+ {
+ s1tony.CM.nsPreferences.setBoolPref("firstRunDone", true);
+
+ // Since first run, place on nav-bar bar
+ CustomizableUI.addWidgetToArea(this._elementId, "nav-bar");
+ this._element = document.getElementById(this._elementId);
+ }
+ }
+ else
+ {
+ console.log("Firefox running Old School");
+
+ this._element = document.getElementById(this._elementId);
+
+ if (!this._element && !s1tony.CM.nsPreferences.getBoolPref("firstRunDone", false))
+ {
+ s1tony.CM.nsPreferences.setBoolPref("firstRunDone", true);
+
+ // Since first run, place on nav-bar bar
+ installButton("nav-bar", this._elementId);
+ this._element = document.getElementById(this._elementId);
+ }
+ }
+
+ // Set tooltip attribute for enhanced tool tip info,
+ // if element available
+ if (this._element)
+ {
+ this._element.removeAttribute("tooltiptext");
+ this._element.setAttribute("tooltip", "cookie-results");
+
+ this._element.addEventListener('command',
+ function(event) {cmReference.extThirdPartyMenuLoadHandler(event)}, false);
+ }
+
+ /**
+ * Installs the toolbar button with the given ID into the given
+ * toolbar, if it is not already present in the document.
+ *
+ * @param {string} toolbarId The ID of the toolbar to install to.
+ * @param {string} id The ID of the button to install.
+ * @param {string} afterId The ID of the element to insert after. @optional
+ */
+ function installButton(toolbarId, id, afterId) {
+ if (!document.getElementById(id)) {
+ var toolbar = document.getElementById(toolbarId);
+
+ // If no afterId is given, then append the item to the toolbar
+ var before = null;
+ if (afterId) {
+ let elem = document.getElementById(afterId);
+ if (elem && elem.parentNode == toolbar)
+ before = elem.nextElementSibling;
+ }
+
+ toolbar.insertItem(id, before);
+ toolbar.setAttribute("currentset", toolbar.currentSet);
+ document.persist(toolbar.id, "currentset");
+
+ if (toolbarId == "addon-bar")
+ toolbar.collapsed = false;
+ }
+ }
+ },
+
+ /**
+ * Get the cookie monster button
+ */
+ getButton: function()
+ {
+ var result = null;
+
+ if (this._element)
+ {
+ result = this._element;
+ }
+ else
+ {
+ // Try to obtain reference
+ this._element = document.getElementById(this._elementId);
+
+ // Set tooltip attribute for enhanced tool tip info,
+ // if element available
+ if (this._element && this._element.hasAttribute("tooltiptext"))
+ {
+ this._element.removeAttribute("tooltiptext");
+ this._element.setAttribute("tooltip", "cookie-results");
+ var that = this;
+
+ this._element.addEventListener('command',
+ function(event) {that._cmReference.extThirdPartyMenuLoadHandler(event)}, false);
+ }
+
+ result = this._element;
+ }
+
+ return result;
+ },
+
+ /**
+ * Set the icon for the Cookie Monster menu button
+ * @param {String} icon
+ */
+ setIcon: function(icon)
+ {
+ this._currentIcon = icon;
+ var button = this.getButton();
+
+ if (button)
+ {
+ button.setAttribute("image", icon);
+ }
+ },
+
+ /**
+ * Get the current icon,
+ * representing cookie access for the URI
+ */
+ getIcon: function()
+ {
+ return this._currentIcon;
+ },
+
+ /**
+ * Set the popup attribute for the Cookie Monster menu button
+ * @param {String} id
+ */
+ setPopup: function(id)
+ {
+ this._currentPopupId = id;
+ var button = this.getButton();
+
+ if (button)
+ {
+ button.setAttribute("popup", id);
+ }
+ },
+
+ /**
+ * This should only be called if the Cookie Monster menu button
+ * has not yet been found (could occur if button in panel)
+ */
+ checkButtonClick: function()
+ {
+ if (this._currentPopupId && this._currentPopupId.length > 0)
+ {
+ this.setIcon(this._currentIcon);
+ this.setPopup(this._currentPopupId);
+ }
+ }
+};
+
s1tony.CM.cookieMonster =
{
_oldURL: null,
_oldAccess: null,
- _browser: null,
_menuBundle: null,
_userDefault: null,
- _statusBarPanel: null,
- _statusBarMenu: null,
- _statusBarMenuId: null,
- _statusBarSubMenu: null,
- _statusBarSubMenuId: null,
- _statusBarMenuArray: null,
+ _cookieMonsterMenu: null,
+ _cookieMonsterMenuId: null,
+ _cookieMonsterSubMenu: null,
+ _cookieMonsterSubMenuId: null,
+ _cookieMonsterMenuArray: null,
_secondLevel: false,
_secondLevelId: null,
_secondLevelMenuOption: null,
@@ -204,10 +394,10 @@ s1tony.CM.cookieMonster =
_currentSubMenu: CM_SECOND_LEVEL,
_reloadOnPermissionChange: false,
_menuStatus: false,
- _iconArray: null,
+ _iconList: null,
_flagMenuEvent: false,
_flagGlobalCookieEvent: false,
- _statusImageAttribute: "src",
+ //_statusImageAttribute: "src",
init: function()
{
@@ -215,13 +405,8 @@ s1tony.CM.cookieMonster =
var that = this;
// Listen for webpage loads
- // gBrowser is only accessible from the scope of Firefox,
- // to use gBrowser within an extension you must declare it
- this._browser = document.getElementById("content");
- this._browser.addProgressListener(s1tony.CM.urlBarListener,
- Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
- gBrowser.addTabsProgressListener(s1tony.CM.tabProgressListener);
-
+ gBrowser.addProgressListener(s1tony.CM.urlBarListener);
+ gBrowser.addTabsProgressListener(s1tony.CM.tabProgressListener);
gBrowser.tabContainer.addEventListener("TabClose", this.tabUnload, false);
copyURI = Components.classes["@mozilla.org/network/io-service;1"].
@@ -232,11 +417,12 @@ s1tony.CM.cookieMonster =
// Add extension name to s1tony.CM.nsPreferences
s1tony.CM.nsPreferences.mBranch = "cookiemonster";
- // Initialize CookieInfo, Utils, ShowCookieMenu and ShowCookieExceptions
+ // Initialize CookieInfo, Utils, ShowCookieMenu, ShowCookieExceptions and CookieMonsterButton
s1tony.CM.cookieInfo.init();
s1tony.CM.utils.init();
s1tony.CM.showCookiesMenu.init();
s1tony.CM.showCookieExceptions.init();
+ s1tony.CM.cookieMonsterButton.init(this, "cookiemonster-status");
// Register preferences and permission observers
s1tony.CM.prefObserver.register();
@@ -248,61 +434,21 @@ s1tony.CM.cookieMonster =
// Create a reference to all the menu elements
this._menuBundle = document.getElementById("cookie-menu-labels");
- this._statusBarPanel = document.getElementById("cookiemonster-status");
-
- // Check if this version of FF contains add-on bar
- var addonBar = document.getElementById("addon-bar");
- var navBar = document.getElementById("nav-bar");
-
- if (addonBar)
- {
- this._statusImageAttribute = "image";
-
- // If Cookie Monster not in any toolbar, add to addon bar
- if (!this._statusBarPanel)
- {
- if (!addonBar.collapsed)
- {
- addonBar.insertItem("cookiemonster-status", null, null, false);
- //addonBar.collapsed = false;
- }
- else if (!navBar.collapsed)
- {
- navBar.insertItem("cookiemonster-status", null, null, false);
- }
-
- this._statusBarPanel = document.getElementById("cookiemonster-status");
- }
- }
-
-// if (cookieMonster_CookieInfo.isExactPermissions())
-// {
-// this._statusBarMenuId = "cookie-access";
-// this._secondLevelId = "second-level";
-// this._statusBarSubMenuId = "cookie-access-alternate";
-// }
-// else
-// {
-// this._statusBarMenuId = "cookie-access-old";
-// this._secondLevelId = "second-level-old";
-// this._statusBarSubMenuId = "cookie-access-alternate";
-// }
-
- this._statusBarMenuId = "cookiemonster-menu";
+ this._cookieMonsterMenuId = "cookiemonster-menu";
this._secondLevelId = "option-second-level";
- this._statusBarSubMenuId = "cookie-access-alternate";
+ this._cookieMonsterSubMenuId = "cookie-access-alternate";
this._globalOverrideId = "show-global-override";
this._thirdPartyId = "cookie-thirdparty-permissions";
// Retrieve the current value for secondlevelurl and
// initialize secondlevelurl in StatusbarMenu
this._secondLevel = s1tony.CM.nsPreferences.getBoolPref("secondlevelurl", false);
- this._statusBarMenu = document.getElementById(this._statusBarMenuId);
- this._statusBarMenu.addEventListener('command', function(event) {that.extMenuCommandHandler(event)},
+ this._cookieMonsterMenu = document.getElementById(this._cookieMonsterMenuId);
+ this._cookieMonsterMenu.addEventListener('command', function(event) {that.extMenuCommandHandler(event)},
true);
- this._statusBarSubMenu = document.getElementById(this._statusBarSubMenuId);
- this._statusBarMenuArray = new Array(this._statusBarMenu, this._statusBarSubMenu);
+ this._cookieMonsterSubMenu = document.getElementById(this._cookieMonsterSubMenuId);
+ this._cookieMonsterMenuArray = new Array(this._cookieMonsterMenu, this._cookieMonsterSubMenu);
this._secondLevelMenuOption = document.getElementById(this._secondLevelId);
if (this._secondLevel)
@@ -321,39 +467,31 @@ s1tony.CM.cookieMonster =
// Retrieve the current value for reloadOnPermissionChange
this._reloadOnPermissionChange = s1tony.CM.nsPreferences.getBoolPref("reloadonpermissionchange", false);
- // Set tooltip attribute for enhanced tool tip info
- this._statusBarPanel.removeAttribute("tooltiptext");
- this._statusBarPanel.setAttribute("tooltip", "cookie-results");
-
- this._statusBarPanel.addEventListener('command',
- function(event) {that.extThirdPartyMenuLoadHandler(event)}, false);
-
- // Load icons into _iconArray (actually an object)
- this._iconArray = new Object();
+ // Load icons into _iconList (actually an object)
+ this._iconList = new Object();
// Determine what default icon to use
if (!s1tony.CM.nsPreferences.getBoolPref("originaldefaulticon", false))
{
- this._iconArray[CM_COOKIE_ACCESS_DEFAULT] = CM_ICON_DEFAULT;
+ this._iconList[CM_COOKIE_ACCESS_DEFAULT] = CM_ICON_DEFAULT;
}
else
{
- this._iconArray[CM_COOKIE_ACCESS_DEFAULT] = CM_ICON_DEFAULT_ORIGINAL;
+ this._iconList[CM_COOKIE_ACCESS_DEFAULT] = CM_ICON_DEFAULT_ORIGINAL;
}
- this._iconArray[CM_COOKIE_ACCESS_TEMP_ALLOW] = CM_ICON_TEMP_ALLOW;
- this._iconArray[CM_COOKIE_ACCESS_ALLOW] = CM_ICON_ALLOW;
- this._iconArray[CM_COOKIE_ACCESS_DENY] = CM_ICON_DENY;
- this._iconArray[CM_COOKIE_ACCESS_SESSION] = CM_ICON_SESSION;
- this._iconArray[CM_COOKIE_ACCESS_ALLOW_OG] = CM_ICON_ALLOW_OG;
- this._iconArray[CM_COOKIE_ACCESS_SESSION_OG] = CM_ICON_SESSION_OG;
+ this._iconList[CM_COOKIE_ACCESS_TEMP_ALLOW] = CM_ICON_TEMP_ALLOW;
+ this._iconList[CM_COOKIE_ACCESS_ALLOW] = CM_ICON_ALLOW;
+ this._iconList[CM_COOKIE_ACCESS_DENY] = CM_ICON_DENY;
+ this._iconList[CM_COOKIE_ACCESS_SESSION] = CM_ICON_SESSION;
+ this._iconList[CM_COOKIE_ACCESS_ALLOW_OG] = CM_ICON_ALLOW_OG;
+ this._iconList[CM_COOKIE_ACCESS_SESSION_OG] = CM_ICON_SESSION_OG;
},
uninit: function()
{
- this._browser.removeProgressListener(s1tony.CM.urlBarListener);
- gBrowser.removeTabsProgressListener(s1tony.CM.tabProgressListener);
-
+ gBrowser.removeProgressListener(s1tony.CM.urlBarListener);
+ gBrowser.removeTabsProgressListener(s1tony.CM.tabProgressListener);
gBrowser.tabContainer.removeEventListener("TabClose", this.tabUnload, false);
// Unregister all observers
@@ -427,11 +565,11 @@ s1tony.CM.cookieMonster =
}
// Walk the menus to update the menuitems
- for (var x = 0; x < this._statusBarMenuArray.length; x++)
+ for (var x = 0; x < this._cookieMonsterMenuArray.length; x++)
{
- if (this._statusBarMenuArray[x].hasChildNodes())
+ if (this._cookieMonsterMenuArray[x].hasChildNodes())
{
- menuNodes = this._statusBarMenuArray[x].childNodes;
+ menuNodes = this._cookieMonsterMenuArray[x].childNodes;
for (var i = 0; i < menuNodes.length; i++)
{
var menu = menuNodes [i];
@@ -520,7 +658,7 @@ s1tony.CM.cookieMonster =
permissionsDisplayResult.setAttribute("label", this._menuBundle.getString("permissionsresultfor") +
" " + aHost + ": " + this._menuBundle.getString(hostAccess));
- permissionsDisplayTop.setAttribute("image", this.getIcon(aAccess[CM_TOP_LEVEL])); //this._iconArray[aAccess[CM_TOP_LEVEL]]
+ permissionsDisplayTop.setAttribute("image", this.getIcon(aAccess[CM_TOP_LEVEL])); //this._iconList[aAccess[CM_TOP_LEVEL]]
permissionsDisplaySecond.setAttribute("image", this.getIcon(aAccess[CM_SECOND_LEVEL]));
permissionsDisplayResult.setAttribute("image", this.getIcon(hostAccess));
@@ -540,7 +678,8 @@ s1tony.CM.cookieMonster =
cookieTooltipResult.lastChild.setAttribute("value", aHost);
// Set the icon for the status bar menu
- this._statusBarPanel.setAttribute(this._statusImageAttribute, this.getIcon(hostAccess));
+ //this._cookieMonsterButton.setAttribute(this._statusImageAttribute, this.getIcon(hostAccess));
+ s1tony.CM.cookieMonsterButton.setIcon(this.getIcon(hostAccess));
},
// Swap the menu items in the submenu
@@ -597,7 +736,7 @@ s1tony.CM.cookieMonster =
swapCookieMenuItems = cookieMenuItems.map(function(menuItem)
{
//alert("swapCookieMenuItems: menuItem " + menuItem[0].getAttribute("id"));
- var replaceItem = this._statusBarSubMenu.replaceChild(menuItem[0], menuItem[1]);
+ var replaceItem = this._cookieMonsterSubMenu.replaceChild(menuItem[0], menuItem[1]);
return replaceItem;
}, that);
@@ -607,11 +746,11 @@ s1tony.CM.cookieMonster =
// Place menu item temp after correct menu separator
if (i == 0)
{
- this._statusBarMenu.insertBefore(swapMenuItem, cookieMenuSeparator.nextSibling);
+ this._cookieMonsterMenu.insertBefore(swapMenuItem, cookieMenuSeparator.nextSibling);
}
else
{
- this._statusBarMenu.appendChild(swapMenuItem);
+ this._cookieMonsterMenu.appendChild(swapMenuItem);
}
}
@@ -755,15 +894,18 @@ s1tony.CM.cookieMonster =
{
if (aEnable)
{
- this._statusBarPanel.setAttribute("popup", this._statusBarMenuId);
+ //this._cookieMonsterButton.setAttribute("popup", this._cookieMonsterMenuId);
+ s1tony.CM.cookieMonsterButton.setPopup(this._cookieMonsterMenuId);
}
else
{
// If disable popup, then
// set the icon for the status bar menu to default
- this._statusBarPanel.setAttribute("popup", "");
- this._statusBarPanel.setAttribute(this._statusImageAttribute, this._iconArray[CM_COOKIE_ACCESS_DEFAULT]);
- }
+// this._cookieMonsterButton.setAttribute("popup", "");
+// this._cookieMonsterButton.setAttribute(this._statusImageAttribute, this._iconList[CM_COOKIE_ACCESS_DEFAULT]);
+ s1tony.CM.cookieMonsterButton.setPopup("");
+ s1tony.CM.cookieMonsterButton.setIcon(this._iconList[CM_COOKIE_ACCESS_DEFAULT]);
+ }
// Set member variable to track status of the menu
this._menuStatus = aEnable;
@@ -771,22 +913,22 @@ s1tony.CM.cookieMonster =
},
// Get the appropriate icon for the access type
- // (Replaces _iconArray for now, in order to
+ // (Replaces _iconList for now, in order to
// properly handle the Global Override functionality)
getIcon: function(aAccess)
{
- var retValue = this._iconArray[aAccess];
+ var retValue = this._iconList[aAccess];
// Check Global Override settings
if (this._usingGlobalOverride && this._allowGlobalOverride)
{
if (aAccess == CM_COOKIE_ACCESS_ALLOW)
{
- retValue = this._iconArray[CM_COOKIE_ACCESS_ALLOW_OG];
+ retValue = this._iconList[CM_COOKIE_ACCESS_ALLOW_OG];
}
else if (aAccess == CM_COOKIE_ACCESS_SESSION)
{
- retValue = this._iconArray[CM_COOKIE_ACCESS_SESSION_OG];
+ retValue = this._iconList[CM_COOKIE_ACCESS_SESSION_OG];
}
}
@@ -839,9 +981,9 @@ s1tony.CM.cookieMonster =
// External access to reloading the current page
extReloadCurrentPage: function()
{
- this._browser.reload(this._browser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
+ gBrowser.reload(gBrowser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
},
-
+
// Return numeric representation of cookie access level
// for current URL and domainType
// If domainType is not passed, then domainType = CM_URL_STANDARD_LEVEL
@@ -889,7 +1031,7 @@ s1tony.CM.cookieMonster =
// Only reload page if reloadOnPermissionChange preference == true
if (this._reloadOnPermissionChange)
{
- this._browser.reload(this._browser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
+ gBrowser.reload(gBrowser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
}
this.updateStatusbarMenu(this._oldURL.asciiHost, this._oldAccess);
@@ -1041,7 +1183,7 @@ s1tony.CM.cookieMonster =
// Only reload page if reloadOnPermissionChange preference == true
if (this._reloadOnPermissionChange)
{
- this._browser.reload(this._browser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
+ gBrowser.reload(gBrowser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
}
//accessString = cookieMonster_CookieInfo.getPermissionString(evt.target.value);
@@ -1142,11 +1284,9 @@ s1tony.CM.cookieMonster =
// Only reload page if reloadOnPermissionChange preference == true
if (this._reloadOnPermissionChange)
{
- this._browser.reload(this._browser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
+ gBrowser.reload(gBrowser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
}
-
- //alert("Got to extThirdPartyMenuAllHandler: target: " + evt.currentTarget.id + " hosts: " + aHosts.toSource());
-
+
evt.stopPropagation();
},
@@ -1213,20 +1353,24 @@ s1tony.CM.cookieMonster =
if (this._usingGlobalOverride)
{
- this._browser.reload(this._browser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
+ gBrowser.reload(gBrowser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
}
}
}
+ else if (aPref == "enablekeyboardshortcut")
+ {
+ document.getElementById("cookiemonster-key").setAttribute("disabled", !s1tony.CM.nsPreferences.getBoolPref("enablekeyboardshortcut", true));
+ }
else if (aPref == "originaldefaulticon")
{
// Determine what default icon to use
if (!s1tony.CM.nsPreferences.getBoolPref("originaldefaulticon", false))
{
- this._iconArray[CM_COOKIE_ACCESS_DEFAULT] = CM_ICON_DEFAULT;
+ this._iconList[CM_COOKIE_ACCESS_DEFAULT] = CM_ICON_DEFAULT;
}
else
{
- this._iconArray[CM_COOKIE_ACCESS_DEFAULT] = CM_ICON_DEFAULT_ORIGINAL;
+ this._iconList[CM_COOKIE_ACCESS_DEFAULT] = CM_ICON_DEFAULT_ORIGINAL;
}
this.updateStatusbarMenu(this._oldURL.asciiHost, this._oldAccess);
@@ -1271,7 +1415,7 @@ s1tony.CM.cookieMonster =
// Only reload page if reloadOnPermissionChange preference == true
if (this._reloadOnPermissionChange)
{
- this._browser.reload(this._browser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
+ gBrowser.reload(gBrowser.webNavigation.LOAD_FLAGS_BYPASS_CACHE);
}
this.updateStatusbarMenu(this._oldURL.asciiHost, this._oldAccess);
diff --git a/chrome/cookiemonster.jar!/content/cookieRequest.js b/chrome/cookiemonster.jar!/content/cookieRequest.js
index 6668ce1..557bf24 100644
--- a/chrome/cookiemonster.jar!/content/cookieRequest.js
+++ b/chrome/cookiemonster.jar!/content/cookieRequest.js
@@ -21,12 +21,13 @@ s1tony.CM.cookieRequest =
_requestHostIndexOf: function(aList, elt /*, checkDomain, from*/)
{
var len = aList.length >>> 0;
- var checkDomain = false || Boolean(arguments[2]);
-
- var from = Number(arguments[3]) || 0;
+ var checkDomain = arguments[2] ? Boolean(arguments[2]) : false;
+ var from = arguments[3] ? Number(arguments[3]) || 0 : 0;
+
from = (from < 0)
? Math.ceil(from)
: Math.floor(from);
+
if (from < 0)
from += len;
@@ -62,12 +63,12 @@ s1tony.CM.cookieRequest =
_requestPropertyIndexOf: function(aList, aProperty, aValue /*, from*/)
{
var len = aList.length >>> 0;
- var checkDomain = false || Boolean(arguments[2]);
-
- var from = Number(arguments[3]) || 0;
+ var from = arguments[3] ? Number(arguments[3]) || 0 : 0;
+
from = (from < 0)
? Math.ceil(from)
: Math.floor(from);
+
if (from < 0)
from += len;
@@ -157,7 +158,7 @@ s1tony.CM.cookieRequest =
aCookieURI = s1tony.CM.utils.createURIFromHostName(aCookieURI);
}
- var aIsDomain = false || Boolean(arguments[2]);
+ var aIsDomain = arguments[2] ? Boolean(arguments[2]) : false;
var secondLevelCookieHost = s1tony.CM.cookieInfo.getSecondLevelHost(aCookieURI.host);
var secondLevelLoadHost;
diff --git a/chrome/cookiemonster.jar!/content/cookieUtils.js b/chrome/cookiemonster.jar!/content/cookieUtils.js
index c323b80..cebca3e 100644
--- a/chrome/cookiemonster.jar!/content/cookieUtils.js
+++ b/chrome/cookiemonster.jar!/content/cookieUtils.js
@@ -30,9 +30,9 @@ s1tony.CM.utils =
isUrlMultipleTabs: function(aHost /*, checkDomain*/)
{
var numberTabs = 0;
- var checkDomain = false || Boolean(arguments[1]);
+ var checkDomain = arguments[1] ? Boolean(arguments[1]) : false;
var num = gBrowser.browsers.length;
-
+
if (!checkDomain)
{
for (var i = 0; i < num; i++)
diff --git a/chrome/cookiemonster.jar!/content/cookies.js b/chrome/cookiemonster.jar!/content/cookies.js
index 6b65756..d1a7369 100644
--- a/chrome/cookiemonster.jar!/content/cookies.js
+++ b/chrome/cookiemonster.jar!/content/cookies.js
@@ -205,7 +205,9 @@ var gSiteCookiesWindow = {
_getItemAtIndex: function (aIndex) {
if (this._filtered)
+ {
return this._filterSet[aIndex];
+ }
var start = 0;
var count = 0, hostIndex = 0;
@@ -509,7 +511,7 @@ var gSiteCookiesWindow = {
// Due to change in chrome://browser/locale/preferences/preferences.properties
// from FF 3.5 to 3.6, AtEndOfSession in <= 3.5 is expireAtEndOfSession in 3.6
- var endOfsession = null;
+ var endOfSession = null;
try
{
diff --git a/chrome/cookiemonster.jar!/content/options.xul b/chrome/cookiemonster.jar!/content/options.xul
index fe81e6a..eeeca48 100644
--- a/chrome/cookiemonster.jar!/content/options.xul
+++ b/chrome/cookiemonster.jar!/content/options.xul
@@ -16,6 +16,7 @@
<preference id="pref-secondlevelurl" name="extensions.cookiemonster.secondlevelurl" type="bool"/>
<preference id="pref-reloadonpermissionchange" name="extensions.cookiemonster.reloadonpermissionchange" type="bool"/>
<preference id="pref-enablecontextmenu" name="extensions.cookiemonster.enablecontextmenu" type="bool"/>
+ <preference id="pref-enablekeyboardshortcut" name="extensions.cookiemonster.enablekeyboardshortcut" type="bool"/>
<preference id="pref-deletecookiesondeny" name="extensions.cookiemonster.deletecookiesondeny" type="bool"/>
<preference id="pref-enableglobalcookieoverride" name="extensions.cookiemonster.enableglobalcookieoverride" type="bool"/>
<preference id="pref-disabledeletecookieconfirm" name="extensions.cookiemonster.disabledeletecookieconfirm" type="bool"/>
@@ -27,6 +28,7 @@
<checkbox label="&secondlevel;" preference="pref-secondlevelurl"/>
<checkbox label="&reloadonpermissionchange;" preference="pref-reloadonpermissionchange"/>
<checkbox label="&enablecontextmenu;" preference="pref-enablecontextmenu"/>
+ <checkbox label="&enablekeyboardshortcut;" preference="pref-enablekeyboardshortcut"/>
<checkbox label="&deletecookies;" preference="pref-deletecookiesondeny"/>
<checkbox label="&enableglobalcookies;" preference="pref-enableglobalcookieoverride"/>
<checkbox label="&disabledeletecookieconfirm;" preference="pref-disabledeletecookieconfirm"/>
diff --git a/chrome/cookiemonster.jar!/content/overlay.js b/chrome/cookiemonster.jar!/content/overlay.js
index bd2e625..61e44f2 100644
--- a/chrome/cookiemonster.jar!/content/overlay.js
+++ b/chrome/cookiemonster.jar!/content/overlay.js
@@ -130,7 +130,6 @@ s1tony.CM.deleteCookies =
s1tony.CM.showCookiesMenu =
{
- _statusImageAttribute: "src",
_popupset: null,
init: function()
@@ -138,11 +137,8 @@ s1tony.CM.showCookiesMenu =
// Retrieve original parent node for cookie monster menu
this._popupset = document.getElementById("cookiemonster-menu").parentNode;
- // Check if this version of FF contains add-on bar
- if (document.getElementById("addon-bar"))
- {
- this._statusImageAttribute = "image";
- }
+ // Set whether or not keyboard shortcut is enabled based on user's preference
+ document.getElementById("cookiemonster-key").setAttribute("disabled", !s1tony.CM.nsPreferences.getBoolPref("enablekeyboardshortcut", true));
},
onMenuItemCommand: function(evt)
@@ -153,18 +149,14 @@ s1tony.CM.showCookiesMenu =
// the cookie-access menu popup
var menuItem = document.getElementById("cookiemonster-context");
var cookieMenu = document.getElementById("cookiemonster-menu");
- var statusBar = document.getElementById("status-bar");
- var statusBarPanel = document.getElementById("cookiemonster-status");
- // Only show the context menu if enablecontextmenu is set to true and
- // statusBarPanel is not null
- // (Will be null if cookie monster is not in any toolbar)
- if (s1tony.CM.nsPreferences.getBoolPref("enablecontextmenu", false) && statusBarPanel)
+ // Only show the context menu if enablecontextmenu is set to true
+ if (s1tony.CM.nsPreferences.getBoolPref("enablecontextmenu", false))
{
if (evt.type == 'popupshown')
{
menuItem.hidden = false;
- menuItem.setAttribute("image", statusBarPanel.getAttribute(this._statusImageAttribute));
+ menuItem.setAttribute("image", s1tony.CM.cookieMonsterButton.getIcon());
cookieMenu.setAttribute("position", "end_before");
menuItem.appendChild(cookieMenu);
}
@@ -184,7 +176,7 @@ s1tony.CM.showCookiesMenu =
{
// Check if cookiemonster-menu popup is showing and hide
var cookieMenu = document.getElementById("cookiemonster-menu");
-
+
if (cookieMenu.state == 'open')
{
cookieMenu.hidePopup();
diff --git a/chrome/cookiemonster.jar!/content/overlay.xul b/chrome/cookiemonster.jar!/content/overlay.xul
index 317c46c..d22b122 100644
--- a/chrome/cookiemonster.jar!/content/overlay.xul
+++ b/chrome/cookiemonster.jar!/content/overlay.xul
@@ -126,7 +126,7 @@
<!-- Shortcut Keys to Menu -->
<keyset>
- <key id="cookiemonster-key" modifiers="control shift" key="M" oncommand="s1tony.CM.showCookiesMenu.onKeyboardShortcut(event);"/>
+ <key id="cookiemonster-key" modifiers="control alt" key="c" oncommand="s1tony.CM.showCookiesMenu.onKeyboardShortcut(event);"/>
</keyset>
</overlay>
diff --git a/chrome/cookiemonster.jar!/content/overlay_toolbar.xul b/chrome/cookiemonster.jar!/content/overlay_toolbar.xul
index 5877b8c..b7b66c7 100644
--- a/chrome/cookiemonster.jar!/content/overlay_toolbar.xul
+++ b/chrome/cookiemonster.jar!/content/overlay_toolbar.xul
@@ -7,118 +7,117 @@
<script src="cookieMonster.js"/>
<script src="overlay.js"/>
- <script src="cookieUtils.js"/>
+ <script src="cookieUtils.js"/>
<script src="cookiePreferences.js"/>
<script src="cookieInfo.js"/>
- <script src="cookieTempAllow.js"/>
+ <script src="cookieTempAllow.js"/>
<script src="cookieRequest.js"/>
<stringbundleset id="stringbundleset">
- <stringbundle id="cookie-preferences" src="chrome://browser/locale/preferences/preferences.properties"/>
- <stringbundle id="cookie-menu-labels" src="chrome://cookiemonster/locale/cookieMonster.properties"/>
+ <stringbundle id="cookie-preferences" src="chrome://browser/locale/preferences/preferences.properties"/>
+ <stringbundle id="cookie-menu-labels" src="chrome://cookiemonster/locale/cookieMonster.properties"/>
</stringbundleset>
-
+
<!-- Tool Bar -->
<toolbarpalette id="BrowserToolbarPalette">
- <toolbarbutton id="cookiemonster-status"
- class="toolbarbutton-1"
+ <toolbarbutton id="cookiemonster-status"
+ class="toolbarbutton-1"
tooltiptext="&cookiemonsterdescription;"
label="&cookiemonster;"
image="chrome://cookiemonster/skin/cookie-monster-logo.png">
</toolbarbutton>
</toolbarpalette>
<popupset> <!-- id="cookieMonster-popupset" -->
- <!-- Cookie Access Popup Menu from overlay id="cookie-access" -->
- <menupopup id="cookiemonster-menu" position="before_end" name="hidden" onpopupshowing="this.setAttribute('name', 'visible');" onpopuphidden="this.setAttribute('name', 'hidden');">
- <menu id="cookie-options-menu" label="&options;">
- <menupopup id="current-options">
- <menuitem id="option-second-level" label="&secondlevel;" type="checkbox"/>
- <menuitem id="show-global-override" label="&globaloverride;" disabled="true"
- oncommand="s1tony.CM.showOverrideGlobal.onMenuItemCommand(event);"/>
- </menupopup>
- </menu>
- <menu id="cookie-view-menu" label="&viewcookies;">
- <menupopup id="view-cookies">
- <menuitem id="show-cookies-site" label="&showcookies;" name=""
- oncommand="s1tony.CM.showCookieExceptions.onMenuItemCommand(event);"/>
- <menuitem id="show-cookies" label="&showallcookies;"
- oncommand="s1tony.CM.showCookieExceptions.onMenuItemCommand(event);"/>
- <menuseparator/>
- <menuitem id="show-exceptions" label="&showcookieexceptions;"
- oncommand="s1tony.CM.showCookieExceptions.onMenuItemCommand(event);"/>
- <menuseparator/>
- <menuitem id="delete-cookies-site" label="&deletecookies;" name=""
- oncommand="s1tony.CM.deleteCookies.onMenuItemCommand(event);"/>
- </menupopup>
- </menu>
- <menu id="cookie-thirdparty-menu" label="&thirdpartycookies;">
- <menupopup id="cookie-thirdparty-permissions">
- <menuitem id="cookie-thirdparty-default-none" label="&thirdpartydefault;" disabled="false" class="menuitem-iconic"/>
- </menupopup>
- </menu>
- <menu id="cookie-permissions-menu" label="¤tpermissions;">
- <menupopup id="current-permissions">
- <menuitem id="permissions-top" label="&sitepermissions;" class="menuitem-iconic"/>
- <menuitem id="permissions-second" label="&domainpermissions;" class="menuitem-iconic"/>
- <menuseparator/>
- <menuitem id="permissions-result" label="&permissionsresult;" class="menuitem-iconic"/>
- </menupopup>
- </menu>
- <menu id="cookie-access-menu" label="&alternatecookieaccess;">
- <menupopup id="cookie-access-alternate">
- <menuitem id="cookie-access-second-temp" value="-1" label="&tempallow;" name="cookie-two" class="menuitem-iconic"/>
- <menuseparator/>
- <menuitem id="cookie-access-second-allow" value="1" label="&allow;" name="cookie-two" class="menuitem-iconic"/>
- <menuitem id="cookie-access-second-deny" value="2" label="&deny;" name="cookie-two" class="menuitem-iconic"/>
- <menuitem id="cookie-access-second-session" value="8" label="&session;" name="cookie-two" class="menuitem-iconic"/>
- </menupopup>
- </menu>
- <menuseparator/>
- <menuitem id="revoke-temp-permissions" label="&revoketempallow;" class="menuitem-iconic"
- oncommand="s1tony.CM.cookieMonster.extResetTempCookies();" />
- <menuseparator/>
- <menuitem id="cookie-access-default-default" value="0" label="&default;" name="current-access" class="menuitem-iconic"/>
- <menuseparator id="temp-after-this"/>
- <menuitem id="cookie-access-top-temp" value="-1" label="&tempallow;" name="cookie-top" class="menuitem-iconic"/>
- <menuseparator id="allow-after-this"/>
- <menuitem id="cookie-access-top-allow" value="1" label="&allow;" name="cookie-top" class="menuitem-iconic"/>
- <menuitem id="cookie-access-top-deny" value="2" label="&deny;" name="cookie-top" class="menuitem-iconic"/>
- <menuitem id="cookie-access-top-session" value="8" label="&session;" name="cookie-top" class="menuitem-iconic"/>
- </menupopup>
+ <!-- Cookie Access Popup Menu from overlay id="cookie-access" -->
+ <menupopup id="cookiemonster-menu" position="before_end" name="hidden" onpopupshowing="this.setAttribute('name', 'visible');" onpopuphidden="this.setAttribute('name', 'hidden');">
+ <menu id="cookie-options-menu" label="&options;">
+ <menupopup id="current-options">
+ <menuitem id="option-second-level" label="&secondlevel;" type="checkbox"/>
+ <menuitem id="show-global-override" label="&globaloverride;" disabled="true"
+ oncommand="s1tony.CM.showOverrideGlobal.onMenuItemCommand(event);"/>
+ </menupopup>
+ </menu>
+ <menu id="cookie-view-menu" label="&viewcookies;">
+ <menupopup id="view-cookies">
+ <menuitem id="show-cookies-site" label="&showcookies;" name=""
+ oncommand="s1tony.CM.showCookieExceptions.onMenuItemCommand(event);"/>
+ <menuitem id="show-cookies" label="&showallcookies;"
+ oncommand="s1tony.CM.showCookieExceptions.onMenuItemCommand(event);"/>
+ <menuseparator/>
+ <menuitem id="show-exceptions" label="&showcookieexceptions;"
+ oncommand="s1tony.CM.showCookieExceptions.onMenuItemCommand(event);"/>
+ <menuseparator/>
+ <menuitem id="delete-cookies-site" label="&deletecookies;" name=""
+ oncommand="s1tony.CM.deleteCookies.onMenuItemCommand(event);"/>
+ </menupopup>
+ </menu>
+ <menu id="cookie-thirdparty-menu" label="&thirdpartycookies;">
+ <menupopup id="cookie-thirdparty-permissions">
+ <menuitem id="cookie-thirdparty-default-none" label="&thirdpartydefault;" disabled="false" class="menuitem-iconic"/>
+ </menupopup>
+ </menu>
+ <menu id="cookie-permissions-menu" label="¤tpermissions;">
+ <menupopup id="current-permissions">
+ <menuitem id="permissions-top" label="&sitepermissions;" class="menuitem-iconic"/>
+ <menuitem id="permissions-second" label="&domainpermissions;" class="menuitem-iconic"/>
+ <menuseparator/>
+ <menuitem id="permissions-result" label="&permissionsresult;" class="menuitem-iconic"/>
+ </menupopup>
+ </menu>
+ <menu id="cookie-access-menu" label="&alternatecookieaccess;">
+ <menupopup id="cookie-access-alternate">
+ <menuitem id="cookie-access-second-temp" value="-1" label="&tempallow;" name="cookie-two" class="menuitem-iconic"/>
+ <menuseparator/>
+ <menuitem id="cookie-access-second-allow" value="1" label="&allow;" name="cookie-two" class="menuitem-iconic"/>
+ <menuitem id="cookie-access-second-deny" value="2" label="&deny;" name="cookie-two" class="menuitem-iconic"/>
+ <menuitem id="cookie-access-second-session" value="8" label="&session;" name="cookie-two" class="menuitem-iconic"/>
+ </menupopup>
+ </menu>
+ <menuseparator/>
+ <menuitem id="revoke-temp-permissions" label="&revoketempallow;" class="menuitem-iconic"
+ oncommand="s1tony.CM.cookieMonster.extResetTempCookies();" />
+ <menuseparator/>
+ <menuitem id="cookie-access-default-default" value="0" label="&default;" name="current-access" class="menuitem-iconic"/>
+ <menuseparator id="temp-after-this"/>
+ <menuitem id="cookie-access-top-temp" value="-1" label="&tempallow;" name="cookie-top" class="menuitem-iconic"/>
+ <menuseparator id="allow-after-this"/>
+ <menuitem id="cookie-access-top-allow" value="1" label="&allow;" name="cookie-top" class="menuitem-iconic"/>
+ <menuitem id="cookie-access-top-deny" value="2" label="&deny;" name="cookie-top" class="menuitem-iconic"/>
+ <menuitem id="cookie-access-top-session" value="8" label="&session;" name="cookie-top" class="menuitem-iconic"/>
+ </menupopup>
- <tooltip id="cookie-results" orient="vertical" position="before_end" class="cookie-status-tooltip"
- onpopupshowing="s1tony.CM.cookieMonster.extSetSiteRequestedSetCookie(event); return (document.getElementById('cookiemonster-menu').getAttribute('name') == 'hidden');">
- <label id="cookie-status-header" value="¤tpermissions;"/>
- <vbox>
- <groupbox id="cookie-group-site" flex="1">
- <caption id="cookie-caption-site" label="&sitepermissions;" image="chrome://cookiemonster/skin/face-monkey-small.png"/>
- <description id="cookie-description-site" value="&default;"/>
- </groupbox>
- <groupbox id="cookie-group-domain" flex="1">
- <caption id="cookie-caption-domain" label="&domainpermissions;" image="chrome://cookiemonster/skin/face-monkey-small.png"/>
- <description id="cookie-description-domain" value="&default;"/>
- </groupbox>
- <separator class="groove"/>
- <groupbox id="cookie-group-result" flex="1">
- <caption id="cookie-caption-result" label="&permissionsresult;" image="chrome://cookiemonster/skin/face-monkey-small.png"/>
- <description id="cookie-description-result" value="&default;"/>
- </groupbox>
- <separator class="groove"/>
- <groupbox id="cookie-group-attempt" flex="1">
- <description id="cookie-description-attempt" value="&default;"/>
- </groupbox>
- </vbox>
- </tooltip>
+ <tooltip id="cookie-results" orient="vertical" position="before_end" class="cookie-status-tooltip"
+ onpopupshowing="s1tony.CM.cookieMonster.extSetSiteRequestedSetCookie(event); return (document.getElementById('cookiemonster-menu').getAttribute('name') == 'hidden');">
+ <label id="cookie-status-header" value="¤tpermissions;"/>
+ <vbox>
+ <groupbox id="cookie-group-site" flex="1">
+ <caption id="cookie-caption-site" label="&sitepermissions;" image="chrome://cookiemonster/skin/face-monkey-small.png"/>
+ <description id="cookie-description-site" value="&default;"/>
+ </groupbox>
+ <groupbox id="cookie-group-domain" flex="1">
+ <caption id="cookie-caption-domain" label="&domainpermissions;" image="chrome://cookiemonster/skin/face-monkey-small.png"/>
+ <description id="cookie-description-domain" value="&default;"/>
+ </groupbox>
+ <separator class="groove"/>
+ <groupbox id="cookie-group-result" flex="1">
+ <caption id="cookie-caption-result" label="&permissionsresult;" image="chrome://cookiemonster/skin/face-monkey-small.png"/>
+ <description id="cookie-description-result" value="&default;"/>
+ </groupbox>
+ <separator class="groove"/>
+ <groupbox id="cookie-group-attempt" flex="1">
+ <description id="cookie-description-attempt" value="&default;"/>
+ </groupbox>
+ </vbox>
+ </tooltip>
</popupset>
-
+
<!-- Firefox Context Menu -->
<popup id="contentAreaContextMenu" onpopupshown="s1tony.CM.showCookiesMenu.onMenuItemCommand(event);"
onpopuphidden="s1tony.CM.showCookiesMenu.onMenuItemCommand(event);">
- <menu id="cookiemonster-context" label="&cookiemonster;" hidden="true" class="menu-iconic">
- </menu>
+ <menu id="cookiemonster-context" label="&cookiemonster;" hidden="true" class="menu-iconic" />
</popup>
-
+
<!-- Shortcut Keys to Menu -->
<keyset>
- <key id="cookiemonster-key" modifiers="control shift" key="M" oncommand="s1tony.CM.showCookiesMenu.onKeyboardShortcut(event);"/>
+ <key id="cookiemonster-key" modifiers="accel alt" key="c" oncommand="s1tony.CM.showCookiesMenu.onKeyboardShortcut(event);"/>
</keyset>
-</overlay>
+</overlay>
diff --git a/chrome/cookiemonster.jar!/locale/de-DE/options.dtd b/chrome/cookiemonster.jar!/locale/de-DE/options.dtd
index 214f2cf..73c0f67 100644
--- a/chrome/cookiemonster.jar!/locale/de-DE/options.dtd
+++ b/chrome/cookiemonster.jar!/locale/de-DE/options.dtd
@@ -4,6 +4,7 @@
<!ENTITY secondlevel "2nd Level Domain Namen verwenden">
<!ENTITY reloadonpermissionchange "Betroffene Seite automatisch bei Änderung der Cookie-Berechtigung neu laden">
<!ENTITY enablecontextmenu "Kontextmenüeintrag für Cookie Monster anzeigen">
+<!ENTITY enablekeyboardshortcut "Aktivieren Sie Tastaturkürzel (Ctrl Alt C)">
<!ENTITY deletecookies "Cookies beim Autorisierungswechsel nach verweigert löschen">
<!ENTITY enableglobalcookies "Überschreiben der globalen Cookieautorisierung aktivieren">
<!ENTITY thirdPartyCookies "3rd Party Cookies blockieren">
diff --git a/chrome/cookiemonster.jar!/locale/en-US/options.dtd b/chrome/cookiemonster.jar!/locale/en-US/options.dtd
index 9708311..f115213 100644
--- a/chrome/cookiemonster.jar!/locale/en-US/options.dtd
+++ b/chrome/cookiemonster.jar!/locale/en-US/options.dtd
@@ -4,6 +4,7 @@
<!ENTITY secondlevel "Use 2nd Level Domain Names">
<!ENTITY reloadonpermissionchange "Automatically Reload Affected Page When Cookie Permissions Change">
<!ENTITY enablecontextmenu "Display Cookie Monster Menu in Context Menu">
+<!ENTITY enablekeyboardshortcut "Enable keyboard shortcut (Ctrl Alt C)">
<!ENTITY deletecookies "Delete Cookies When Changing access to Deny">
<!ENTITY enableglobalcookies "Enable Global Cookie Permissions Override">
<!ENTITY thirdPartyCookies "Block 3rd Party Cookies">
diff --git a/chrome/cookiemonster.jar!/locale/fr-FR/options.dtd b/chrome/cookiemonster.jar!/locale/fr-FR/options.dtd
index 439ea61..21c046c 100644
--- a/chrome/cookiemonster.jar!/locale/fr-FR/options.dtd
+++ b/chrome/cookiemonster.jar!/locale/fr-FR/options.dtd
@@ -4,6 +4,7 @@
<!ENTITY secondlevel "Appliquer les même permissions sur l'ensemble du nom de domaine">
<!ENTITY reloadonpermissionchange "Recharger automatiquement les pages affectées après un changement de permission">
<!ENTITY enablecontextmenu "Afficher Cookie Monster dans le menu contextuel">
+<!ENTITY enablekeyboardshortcut "Activer raccourci clavier (Ctrl Alt C)">
<!ENTITY deletecookies "Supprimer les cookies lors du passage à l'état 'interdire'">
<!ENTITY enableglobalcookies "Autoriser d'outre-passer les permissions par défaut">
<!ENTITY thirdPartyCookies "Bloquer les cookies tiers">
diff --git a/chrome/cookiemonster.jar!/locale/it-IT/options.dtd b/chrome/cookiemonster.jar!/locale/it-IT/options.dtd
index 3d2c465..c2b68d8 100644
--- a/chrome/cookiemonster.jar!/locale/it-IT/options.dtd
+++ b/chrome/cookiemonster.jar!/locale/it-IT/options.dtd
@@ -4,6 +4,7 @@
<!ENTITY secondlevel "Utilizza i nomi di dominio di 2° livello">
<!ENTITY reloadonpermissionchange "Ricarica automaticamente la pagina quando cambiano i permessi dei cookie">
<!ENTITY enablecontextmenu "Visualizza la voce Cookie Monster nel menu contestuale">
+<!ENTITY enablekeyboardshortcut "Attiva scorciatoia da tastiera (Ctrl Alt C)">
<!ENTITY deletecookies "Elimina i cookie quando si imposta un blocco">
<!ENTITY enableglobalcookies "Attiva sostituzione globale dei permessi sui cookie">
<!ENTITY thirdPartyCookies "Blocca cookie di terze parti">
diff --git a/chrome/cookiemonster.jar!/locale/nl-NL/options.dtd b/chrome/cookiemonster.jar!/locale/nl-NL/options.dtd
index a1300fe..3b3481e 100644
--- a/chrome/cookiemonster.jar!/locale/nl-NL/options.dtd
+++ b/chrome/cookiemonster.jar!/locale/nl-NL/options.dtd
@@ -4,6 +4,7 @@
<!ENTITY secondlevel "Gebruik 2e niveau domeinnamen">
<!ENTITY reloadonpermissionchange "Automatisch betreffende pagina herladen, wanneer Cookie permissies worden gewijzigd">
<!ENTITY enablecontextmenu "Cookie Monster menu in context menu tonen">
+<!ENTITY enablekeyboardshortcut "Sneltoets inschakelen (Ctrl Alt C)">
<!ENTITY deletecookies "Verwijder Cookies wanneer de toegang wordt gewijzigd naar geblokkeerd">
<!ENTITY enableglobalcookies "Activeer omzeilen globale Cookie permissies">
<!ENTITY thirdPartyCookies "Blokkeer 3e partij Cookies">
diff --git a/chrome/cookiemonster.jar!/locale/ru-RU/options.dtd b/chrome/cookiemonster.jar!/locale/ru-RU/options.dtd
index 01b50b7..575d782 100644
--- a/chrome/cookiemonster.jar!/locale/ru-RU/options.dtd
+++ b/chrome/cookiemonster.jar!/locale/ru-RU/options.dtd
@@ -4,6 +4,7 @@
<!ENTITY secondlevel "Использовать имена доменов второго уровня">
<!ENTITY reloadonpermissionchange "Автоматически перезагружать страницу после изменений разрешений куки">
<!ENTITY enablecontextmenu "Показывать меню настроек Cookie Monster в контекстном меню">
+<!ENTITY enablekeyboardshortcut "Включить комбинации клавиш на клавиатуре(Ctrl Alt C)">
<!ENTITY deletecookies "Удалить куки при изменении доступа на Запретить">
<!ENTITY enableglobalcookies "Включить переопределение глобальных разрешений куки">
<!ENTITY thirdPartyCookies "Блокировать сторонние куки">
diff --git a/chrome/cookiemonster.jar!/locale/zh-TW/options.dtd b/chrome/cookiemonster.jar!/locale/zh-TW/options.dtd
index 46dd7ef..47a99bf 100644
--- a/chrome/cookiemonster.jar!/locale/zh-TW/options.dtd
+++ b/chrome/cookiemonster.jar!/locale/zh-TW/options.dtd
@@ -4,6 +4,7 @@
<!ENTITY secondlevel "使用第二層網域名稱">
<!ENTITY reloadonpermissionchange "Cookie 存取權改變時自動更新受影響的頁面">
<!ENTITY enablecontextmenu "在右鍵選單顯示 Cookie Monster">
+<!ENTITY enablekeyboardshortcut "啟用鍵盤捷徑 (Ctrl Alt C)">
<!ENTITY deletecookies "存取權變為拒絕時刪除 Cookies">
<!ENTITY enableglobalcookies "啟用全域 Cookie 權限覆載">
<!ENTITY thirdPartyCookies "阻擋來自第三方的 Cookies">
diff --git a/chrome/cookiemonster.jar!/skin/cookie-monster-logo_old.png b/chrome/cookiemonster.jar!/skin/cookie-monster-logo_old.png
new file mode 100644
index 0000000..cf66a1d
Binary files /dev/null and b/chrome/cookiemonster.jar!/skin/cookie-monster-logo_old.png differ
diff --git a/defaults/preferences/defaults.js b/defaults/preferences/defaults.js
index 11eda29..3a29e0e 100644
--- a/defaults/preferences/defaults.js
+++ b/defaults/preferences/defaults.js
@@ -1,6 +1,8 @@
+pref("extensions.cookiemonster.firstRunDone", false);
pref("extensions.cookiemonster.secondlevelurl", true);
pref("extensions.cookiemonster.reloadonpermissionchange", true);
pref("extensions.cookiemonster.enablecontextmenu", false);
+pref("extensions.cookiemonster.enablekeyboardshortcut", true);
pref("extensions.cookiemonster.enableglobalcookieoverride", false);
pref("extensions.cookiemonster.deletecookiesondeny", false);
pref("extensions.cookiemonster.tempcookie", "");
diff --git a/install.rdf b/install.rdf
index cd51103..a14fb79 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>{45d8ff86-d909-11db-9705-005056c00008}</em:id>
- <em:version>1.1.0</em:version>
+ <em:version>1.2.0</em:version>
<em:type>2</em:type>
<em:optionsURL>chrome://cookiemonster/content/options.xul</em:optionsURL>
<!-- <em:iconURL>chrome://cookiemonster/skin/face-monkey.png</em:iconURL> -->
@@ -17,7 +17,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.5</em:minVersion>
- <em:maxVersion>8.*</em:maxVersion>
+ <em:maxVersion>30.*</em:maxVersion>
</Description>
</em:targetApplication>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/cookie-monster.git
More information about the Pkg-mozext-commits
mailing list