[Pkg-mozext-commits] [requestpolicy] 14/80: rename the `requestpolicyBlocked` attribute

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 8c293ad0e2de47d6b2ec49ff472ac194df64b69c
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue May 12 01:40:31 2015 +0200

    rename the `requestpolicyBlocked` attribute
---
 src/content/lib/request-processor.jsm   |  4 +++-
 src/content/ui/frame.blocked-content.js |  2 +-
 src/content/ui/overlay.js               |  2 +-
 src/skin/toolbarbutton-seamonkey.css    |  8 ++++----
 src/skin/toolbarbutton.css              | 18 +++++++++---------
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index f8d6801..c944332 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -142,7 +142,9 @@ let RequestProcessor = (function(self) {
     }
 
     if (request.aContext) {
-      request.aContext.requestpolicyBlocked = true;
+      // fixme: `rpcontinuedBlocked` is probably not needed anymore.
+      //        There's now `rpcontinuedIdentified`.
+      request.aContext.rpcontinuedBlocked = true;
     }
 
     cacheShouldLoadResult(CP_REJECT, request.originURI, request.destURI);
diff --git a/src/content/ui/frame.blocked-content.js b/src/content/ui/frame.blocked-content.js
index c361ce9..1b00e00 100644
--- a/src/content/ui/frame.blocked-content.js
+++ b/src/content/ui/frame.blocked-content.js
@@ -71,7 +71,7 @@ let ManagerForBlockedContent = (function() {
 
     for (var i = 0; i < images.length; i++) {
       var img = images[i];
-      // Note: we're no longer checking img.requestpolicyBlocked here.
+      // Note: we're no longer checking img.rpcontinuedBlocked here.
       if (!img.rpcontinuedIdentified && img.src in blockedURIs) {
         img.rpcontinuedIdentified = true;
         img.style.border = "solid 1px #fcc";
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 45c371b..4b8127b 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -624,7 +624,7 @@ requestpolicy.overlay = (function() {
   self._setContentBlockedState = function(isContentBlocked) {
     var button = $id(toolbarButtonId);
     if (button) {
-      button.setAttribute("requestpolicyBlocked", isContentBlocked);
+      button.setAttribute("rpcontinuedBlocked", isContentBlocked);
     }
   };
 
diff --git a/src/skin/toolbarbutton-seamonkey.css b/src/skin/toolbarbutton-seamonkey.css
index 816ca39..e17f29b 100644
--- a/src/skin/toolbarbutton-seamonkey.css
+++ b/src/skin/toolbarbutton-seamonkey.css
@@ -23,12 +23,12 @@ toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
  */
 
 /* default: */ toolbar #requestpolicyToolbarButton,
-/* blocked: */ toolbar #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
+/* blocked: */ toolbar #requestpolicyToolbarButton[rpcontinuedBlocked="true"] {
   list-style-image:
     url(chrome://rpcontinued/skin/requestpolicy-icon-32-blocked.png);
 }
 /* default: */ toolbar[iconsize="small"] #requestpolicyToolbarButton,
-/* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
+/* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[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[requestpolicyBlocked="false"] {
+/* allowed: */ toolbar #requestpolicyToolbarButton[rpcontinuedBlocked="false"] {
   list-style-image:
     url(chrome://rpcontinued/skin/requestpolicy-icon-32-allowed.png);
 }
-/* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
+/* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[rpcontinuedBlocked="false"] {
   list-style-image:
     url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
 }
diff --git a/src/skin/toolbarbutton.css b/src/skin/toolbarbutton.css
index afe864b..9d3df6b 100644
--- a/src/skin/toolbarbutton.css
+++ b/src/skin/toolbarbutton.css
@@ -8,7 +8,7 @@
     url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
 }
 
-#requestpolicyContextMenu[requestpolicyBlocked="true"] {
+#requestpolicyContextMenu[rpcontinuedBlocked="true"] {
   list-style-image:
     url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
   color: #a00;
@@ -92,23 +92,23 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
 
 /*** Australis only: (the new menu) ***/
 /* default: */ #requestpolicyToolbarButton[cui-areatype="menu-panel"],
-/* blocked: */ #requestpolicyToolbarButton[cui-areatype="menu-panel"][requestpolicyBlocked="true"] {
+/* blocked: */ #requestpolicyToolbarButton[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[requestpolicyBlocked="true"] {
+/* blocked: */ toolbar[iconsize="large"] #requestpolicyToolbarButton[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"][requestpolicyBlocked="true"],
+/* blocked: */ #requestpolicyToolbarButton[cui-areatype="toolbar"][rpcontinuedBlocked="true"],
 /** non-Australis: **/
 /* default: */ toolbar[iconsize="small"] #requestpolicyToolbarButton,
-/* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
+/* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[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"][requestpolicyBlocked="false"] {
+/* allowed: */ #requestpolicyToolbarButton[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[requestpolicyBlocked="false"] {
+/* allowed: */ toolbar[iconsize="large"] #requestpolicyToolbarButton[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"][requestpolicyBlocked="false"],
+/* allowed: */ #requestpolicyToolbarButton[cui-areatype="toolbar"][rpcontinuedBlocked="false"],
 /** selectors for non-Australis **/
-/* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
+/* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[rpcontinuedBlocked="false"] {
   list-style-image:
     url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git