[Pkg-mozext-commits] [requestpolicy] 16/80: change the toolbar button's ID
David Prévot
taffit at moszumanska.debian.org
Sun Jul 5 15:02:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit c54f73cf985079e353984ac4ecc8cb3bd72c266d
Author: Martin Kimmerle <dev at 256k.de>
Date: Tue May 12 01:45:05 2015 +0200
change the toolbar button's ID
old: requestpolicyToolbarButton
new: rpcontinuedToolbarButton
---
src/content/main/window-manager-toolbarbutton.js | 2 +-
src/content/ui/overlay.js | 2 +-
src/content/ui/xul-trees.js | 2 +-
src/skin/toolbarbutton-seamonkey.css | 22 +++++------
src/skin/toolbarbutton.css | 44 +++++++++++-----------
.../tests/testPolicy/lib/num-request-counter.js | 2 +-
6 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/content/main/window-manager-toolbarbutton.js b/src/content/main/window-manager-toolbarbutton.js
index e73e5a8..8bd478f 100644
--- a/src/content/main/window-manager-toolbarbutton.js
+++ b/src/content/main/window-manager-toolbarbutton.js
@@ -25,7 +25,7 @@ const Ci = Components.interfaces;
const Cc = Components.classes;
const Cu = Components.utils;
-const toolbarButtonId = "requestpolicyToolbarButton";
+const toolbarButtonId = "rpcontinuedToolbarButton";
Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 4b8127b..cfcb76b 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -72,7 +72,7 @@ requestpolicy.overlay = (function() {
let initialized = false;
- let toolbarButtonId = "requestpolicyToolbarButton";
+ let toolbarButtonId = "rpcontinuedToolbarButton";
let overlayId = 0;
diff --git a/src/content/ui/xul-trees.js b/src/content/ui/xul-trees.js
index 9bfda75..9f82e43 100644
--- a/src/content/ui/xul-trees.js
+++ b/src/content/ui/xul-trees.js
@@ -29,7 +29,7 @@ let isSeamonkey = appID === C.SEAMONKEY_ID;
exports.toolbarbutton = [
{parent: {special: {type: "subobject", id: "navigator-toolbox",
tree: ["palette"]}}, // ("#navigator-toolbox".palette)
- tag: "toolbarbutton", id: "requestpolicyToolbarButton",
+ tag: "toolbarbutton", id: "rpcontinuedToolbarButton",
label: "RequestPolicy", tooltiptext: "RequestPolicy",
popup: "rp-popup"
}
diff --git a/src/skin/toolbarbutton-seamonkey.css b/src/skin/toolbarbutton-seamonkey.css
index e17f29b..5f01358 100644
--- a/src/skin/toolbarbutton-seamonkey.css
+++ b/src/skin/toolbarbutton-seamonkey.css
@@ -5,12 +5,12 @@
* (the !important keyword is necessary.)
*/
/* 32px is the default icon size in SeaMonkey */
-toolbar > toolbarpaletteitem #requestpolicyToolbarButton,
-#palette-box #requestpolicyToolbarButton {
+toolbar > toolbarpaletteitem #rpcontinuedToolbarButton,
+#palette-box #rpcontinuedToolbarButton {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-32-blocked.png) !important;
}
-toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
+toolbar[iconsize="small"] > toolbarpaletteitem #rpcontinuedToolbarButton {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png) !important;
}
@@ -22,13 +22,13 @@ toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
* ==> red flag.
*/
-/* default: */ toolbar #requestpolicyToolbarButton,
-/* blocked: */ toolbar #requestpolicyToolbarButton[rpcontinuedBlocked="true"] {
+/* default: */ toolbar #rpcontinuedToolbarButton,
+/* blocked: */ toolbar #rpcontinuedToolbarButton[rpcontinuedBlocked="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-32-blocked.png);
}
-/* default: */ toolbar[iconsize="small"] #requestpolicyToolbarButton,
-/* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[rpcontinuedBlocked="true"] {
+/* default: */ toolbar[iconsize="small"] #rpcontinuedToolbarButton,
+/* blocked: */ toolbar[iconsize="small"] #rpcontinuedToolbarButton[rpcontinuedBlocked="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
}
@@ -39,11 +39,11 @@ toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
* ==> grey flag.
*/
-/* allowed: */ toolbar #requestpolicyToolbarButton[rpcontinuedBlocked="false"] {
+/* allowed: */ toolbar #rpcontinuedToolbarButton[rpcontinuedBlocked="false"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-32-allowed.png);
}
-/* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[rpcontinuedBlocked="false"] {
+/* allowed: */ toolbar[iconsize="small"] #rpcontinuedToolbarButton[rpcontinuedBlocked="false"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
}
@@ -54,11 +54,11 @@ toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
* ==> yellow flag.
*/
-toolbar #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
+toolbar #rpcontinuedToolbarButton[requestpolicyPermissive="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-32-disabled.png);
}
-toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
+toolbar[iconsize="small"] #rpcontinuedToolbarButton[requestpolicyPermissive="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-disabled.png);
}
diff --git a/src/skin/toolbarbutton.css b/src/skin/toolbarbutton.css
index 9d3df6b..df25def 100644
--- a/src/skin/toolbarbutton.css
+++ b/src/skin/toolbarbutton.css
@@ -67,18 +67,18 @@
* ==> red flag.
* (the !important keyword is necessary.)
*/
-toolbarpaletteitem #requestpolicyToolbarButton,
-toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
+toolbarpaletteitem #rpcontinuedToolbarButton,
+toolbar[iconsize="small"] > toolbarpaletteitem #rpcontinuedToolbarButton {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png) !important;
}
-toolbar > toolbarpaletteitem #requestpolicyToolbarButton,
-toolbar[iconsize="large"] > toolbarpaletteitem #requestpolicyToolbarButton {
+toolbar > toolbarpaletteitem #rpcontinuedToolbarButton,
+toolbar[iconsize="large"] > toolbarpaletteitem #rpcontinuedToolbarButton {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-24-blocked.png) !important;
}
-toolbarpaletteitem[place="palette"] #requestpolicyToolbarButton,
-toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
+toolbarpaletteitem[place="palette"] #rpcontinuedToolbarButton,
+toolbarpaletteitem[place="panel"] #rpcontinuedToolbarButton {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-32.png) !important;
}
@@ -91,24 +91,24 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
*/
/*** Australis only: (the new menu) ***/
-/* default: */ #requestpolicyToolbarButton[cui-areatype="menu-panel"],
-/* blocked: */ #requestpolicyToolbarButton[cui-areatype="menu-panel"][rpcontinuedBlocked="true"] {
+/* default: */ #rpcontinuedToolbarButton[cui-areatype="menu-panel"],
+/* blocked: */ #rpcontinuedToolbarButton[cui-areatype="menu-panel"][rpcontinuedBlocked="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-32.png);
}
/*** non-Australis only ***/
-/* default: */ toolbar[iconsize="large"] #requestpolicyToolbarButton,
-/* blocked: */ toolbar[iconsize="large"] #requestpolicyToolbarButton[rpcontinuedBlocked="true"] {
+/* default: */ toolbar[iconsize="large"] #rpcontinuedToolbarButton,
+/* blocked: */ toolbar[iconsize="large"] #rpcontinuedToolbarButton[rpcontinuedBlocked="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-24-blocked.png);
}
/*** "normal" toolbars (16px icons) ***/
/** Australis: **/
-/* default: */ #requestpolicyToolbarButton[cui-areatype="toolbar"],
-/* blocked: */ #requestpolicyToolbarButton[cui-areatype="toolbar"][rpcontinuedBlocked="true"],
+/* default: */ #rpcontinuedToolbarButton[cui-areatype="toolbar"],
+/* blocked: */ #rpcontinuedToolbarButton[cui-areatype="toolbar"][rpcontinuedBlocked="true"],
/** non-Australis: **/
-/* default: */ toolbar[iconsize="small"] #requestpolicyToolbarButton,
-/* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[rpcontinuedBlocked="true"] {
+/* default: */ toolbar[iconsize="small"] #rpcontinuedToolbarButton,
+/* blocked: */ toolbar[iconsize="small"] #rpcontinuedToolbarButton[rpcontinuedBlocked="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
}
@@ -121,20 +121,20 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
/*** Australis only: (the new menu) ***/
-/* allowed: */ #requestpolicyToolbarButton[cui-areatype="menu-panel"][rpcontinuedBlocked="false"] {
+/* allowed: */ #rpcontinuedToolbarButton[cui-areatype="menu-panel"][rpcontinuedBlocked="false"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-32-allowed.png);
}
/*** non-Australis only ***/
-/* allowed: */ toolbar[iconsize="large"] #requestpolicyToolbarButton[rpcontinuedBlocked="false"] {
+/* allowed: */ toolbar[iconsize="large"] #rpcontinuedToolbarButton[rpcontinuedBlocked="false"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-24-allowed.png);
}
/*** "normal" toolbars (16px icons) ***/
/** selectors for Australis **/
-/* allowed: */ #requestpolicyToolbarButton[cui-areatype="toolbar"][rpcontinuedBlocked="false"],
+/* allowed: */ #rpcontinuedToolbarButton[cui-areatype="toolbar"][rpcontinuedBlocked="false"],
/** selectors for non-Australis **/
-/* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[rpcontinuedBlocked="false"] {
+/* allowed: */ toolbar[iconsize="small"] #rpcontinuedToolbarButton[rpcontinuedBlocked="false"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
}
@@ -145,20 +145,20 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
*/
/*** Australis only: (the new menu) ***/
-#requestpolicyToolbarButton[cui-areatype="menu-panel"][requestpolicyPermissive="true"] {
+#rpcontinuedToolbarButton[cui-areatype="menu-panel"][requestpolicyPermissive="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-32-disabled.png);
}
/*** non-Australis only ***/
-toolbar[iconsize="large"] #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
+toolbar[iconsize="large"] #rpcontinuedToolbarButton[requestpolicyPermissive="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-24-disabled.png);
}
/*** "normal" toolbars (16px icons) ***/
/** Australis: **/
-#requestpolicyToolbarButton[cui-areatype="toolbar"][requestpolicyPermissive="true"],
+#rpcontinuedToolbarButton[cui-areatype="toolbar"][requestpolicyPermissive="true"],
/** non-Australis: **/
-toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
+toolbar[iconsize="small"] #rpcontinuedToolbarButton[requestpolicyPermissive="true"] {
list-style-image:
url(chrome://rpcontinued/skin/requestpolicy-icon-disabled.png);
}
diff --git a/tests/mozmill/tests/testPolicy/lib/num-request-counter.js b/tests/mozmill/tests/testPolicy/lib/num-request-counter.js
index aba168c..5a89668 100644
--- a/tests/mozmill/tests/testPolicy/lib/num-request-counter.js
+++ b/tests/mozmill/tests/testPolicy/lib/num-request-counter.js
@@ -19,7 +19,7 @@ function NumRequestsCounter(controller) {
let self = this;
let rpMenuButton = findElement.ID(controller.window.document,
- 'requestpolicyToolbarButton');
+ 'rpcontinuedToolbarButton');
let rpMenuPopup = findElement.ID(controller.window.document, 'rp-popup');
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list