[Pkg-mozext-commits] [requestpolicy] 26/80: Rename many identifiers prefixed with "rp-"

David Prévot taffit at moszumanska.debian.org
Sun Jul 5 15:02:25 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 d73b9bd54079c08a5e8b959865b9411ed72c3971
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue May 12 02:43:38 2015 +0200

    Rename many identifiers prefixed with "rp-"
    
    The following IDs have been renamed:
    
    - rp-allowed-destinations
    - rp-allowed-destinations-list
    - rp-allowed-destinations-title
    - rp-blocked-destinations
    - rp-blocked-destinations-list
    - rp-blocked-destinations-title
    - rp-contents
    - rp-details
    - rp-footer
    - rp-footer-link
    - rp-footer-links
    - rp-label-list
    - rp-link-disable-blocking
    - rp-link-enable-blocking
    - rp-link-help
    - rp-link-policies
    - rp-link-prefs
    - rp-link-request-log
    - rp-main
    - rp-mixed-destinations
    - rp-mixed-destinations-list
    - rp-mixed-destinations-title
    - rp-od-item
    - rp-origin
    - rp-origin-domainname
    - rp-origin-num-requests
    - rp-origins-destinations
    - rp-other-origins
    - rp-other-origins-list
    - rp-other-origins-title
    - rp-revoke-temporary-permissions
    - rp-rules-add
    - rp-rules-info
    - rp-rules-remove
---
 src/content/ui/menu.js                             |  74 +++++++-------
 src/content/ui/overlay.js                          |   4 +-
 src/content/ui/xul-trees.js                        |  76 +++++++-------
 src/skin/requestpolicy.css                         | 110 ++++++++++-----------
 tests/mozmill/lib/request-log-utils.js             |   2 +-
 .../tests/testPolicy/lib/num-request-counter.js    |   4 +-
 6 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index 6d57f53..641ef97 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -82,16 +82,16 @@ requestpolicy.menu = (function() {
     if (initialized === false) {
       initialized = true;
 
-      self._originItem = document.getElementById("rp-origin");
-      self._originDomainnameItem = $id('rp-origin-domainname');
-      self._originNumRequestsItem = $id('rp-origin-num-requests');
+      self._originItem = document.getElementById("rpc-origin");
+      self._originDomainnameItem = $id('rpc-origin-domainname');
+      self._originNumRequestsItem = $id('rpc-origin-num-requests');
 
-      self._otherOriginsList = $id("rp-other-origins-list");
-      self._blockedDestinationsList = $id("rp-blocked-destinations-list");
-      self._mixedDestinationsList = $id("rp-mixed-destinations-list");
-      self._allowedDestinationsList = $id("rp-allowed-destinations-list");
-      self._addRulesList = $id("rp-rules-add");
-      self._removeRulesList = $id("rp-rules-remove");
+      self._otherOriginsList = $id("rpc-other-origins-list");
+      self._blockedDestinationsList = $id("rpc-blocked-destinations-list");
+      self._mixedDestinationsList = $id("rpc-mixed-destinations-list");
+      self._allowedDestinationsList = $id("rpc-allowed-destinations-list");
+      self._addRulesList = $id("rpc-rules-add");
+      self._removeRulesList = $id("rpc-rules-remove");
 
       var conflictCount = RequestProcessor.getConflictingExtensions().length;
       var hideConflictInfo = (conflictCount == 0);
@@ -102,10 +102,10 @@ requestpolicy.menu = (function() {
   self.prepareMenu = function() {
     try {
       var disabled = Prefs.isBlockingDisabled();
-      $id('rp-link-enable-blocking').hidden = !disabled;
-      $id('rp-link-disable-blocking').hidden = disabled;
+      $id('rpc-link-enable-blocking').hidden = !disabled;
+      $id('rpc-link-disable-blocking').hidden = disabled;
 
-      $id('rp-revoke-temporary-permissions').hidden =
+      $id('rpc-revoke-temporary-permissions').hidden =
           !PolicyManager.temporaryRulesExist();
 
       self._currentUri = requestpolicy.overlay.getTopLevelDocumentUri();
@@ -168,7 +168,7 @@ requestpolicy.menu = (function() {
 
       self._populateOrigin();
       self._populateOtherOrigins();
-      self._activateOriginItem($id("rp-origin"));
+      self._activateOriginItem($id("rpc-origin"));
 
     } catch (e) {
       Logger.severe(Logger.TYPE_ERROR,
@@ -192,10 +192,10 @@ requestpolicy.menu = (function() {
         self._allowedDestinationsList,
         self._removeRulesList,
         self._addRulesList]);
-    $id('rp-other-origins').hidden = true;
-    $id('rp-blocked-destinations').hidden = true;
-    $id('rp-mixed-destinations').hidden = true;
-    $id('rp-allowed-destinations').hidden = true;
+    $id('rpc-other-origins').hidden = true;
+    $id('rpc-blocked-destinations').hidden = true;
+    $id('rpc-mixed-destinations').hidden = true;
+    $id('rpc-allowed-destinations').hidden = true;
     // TODO: show some message about why the menu is empty.
   };
 
@@ -228,7 +228,7 @@ requestpolicy.menu = (function() {
                 "+" + props.numAllowedRequests + ")";
           }
         }
-        var newitem = self._addListItem(list, 'rp-od-item', guiLocation, num);
+        var newitem = self._addListItem(list, 'rpc-od-item', guiLocation, num);
 
         newitem.setAttribute("default-policy",
             (props.numDefaultPolicyRequests > 0 ? "true" : "false"));
@@ -238,7 +238,7 @@ requestpolicy.menu = (function() {
     } else {
       values.sort();
       for (var i in values) {
-        self._addListItem(list, 'rp-od-item', values[i]);
+        self._addListItem(list, 'rpc-od-item', values[i]);
       }
     }
   };
@@ -271,7 +271,7 @@ requestpolicy.menu = (function() {
   self._populateOtherOrigins = function() {
     var guiOrigins = self._getOtherOriginsAsGUILocations();
     self._populateList(self._otherOriginsList, guiOrigins);
-    $id('rp-other-origins').hidden = guiOrigins.length == 0;
+    $id('rpc-other-origins').hidden = guiOrigins.length == 0;
   };
 
   self._populateDestinations = function(originIdentifier) {
@@ -323,15 +323,15 @@ requestpolicy.menu = (function() {
 
     self._populateList(self._blockedDestinationsList,
         destsWithSolelyBlockedRequests);
-    $id('rp-blocked-destinations').hidden =
+    $id('rpc-blocked-destinations').hidden =
         destsWithSolelyBlockedRequests.length == 0;
 
     self._populateList(self._mixedDestinationsList, destsMixed);
-    $id('rp-mixed-destinations').hidden = destsMixed.length == 0;
+    $id('rpc-mixed-destinations').hidden = destsMixed.length == 0;
 
     self._populateList(self._allowedDestinationsList,
         destsWithSolelyAllowedRequests);
-    $id('rp-allowed-destinations').hidden =
+    $id('rpc-allowed-destinations').hidden =
         destsWithSolelyAllowedRequests.length == 0;
   };
 
@@ -473,7 +473,7 @@ requestpolicy.menu = (function() {
   self._setPrivateBrowsingStyles = function() {
     let mayPermRulesBeAdded = WindowUtils.mayPermanentRulesBeAdded(window);
     let val = mayPermRulesBeAdded === true ? '' : 'privatebrowsing';
-    $id('rp-details').setAttribute('class', val);
+    $id('rpc-details').setAttribute('class', val);
   };
 
   self._resetSelectedOrigin = function() {
@@ -500,10 +500,10 @@ requestpolicy.menu = (function() {
   };
 
   self._activateOriginItem = function(item) {
-    if (item.id == 'rp-origin') {
+    if (item.id == 'rpc-origin') {
       // it's _the_ origin
       self._currentlySelectedOrigin = self._originDomainnameItem.value;
-    } else if (item.parentNode.id == 'rp-other-origins-list') {
+    } else if (item.parentNode.id == 'rpc-other-origins-list') {
       // it's an otherOrigin
       self._currentlySelectedOrigin = item.getElementsByClassName("domainname")[0].value;
     }
@@ -520,10 +520,10 @@ requestpolicy.menu = (function() {
   self._activateDestinationItem = function(item) {
     self._currentlySelectedDest = item.getElementsByClassName("domainname")[0].value;
 
-    if (item.parentNode.id == 'rp-blocked-destinations-list') {
+    if (item.parentNode.id == 'rpc-blocked-destinations-list') {
       self._isCurrentlySelectedDestBlocked = true;
       self._isCurrentlySelectedDestAllowed = false;
-    } else if (item.parentNode.id == 'rp-allowed-destinations-list') {
+    } else if (item.parentNode.id == 'rpc-allowed-destinations-list') {
       self._isCurrentlySelectedDestBlocked = false;
       self._isCurrentlySelectedDestAllowed = true;
     } else {
@@ -546,16 +546,16 @@ requestpolicy.menu = (function() {
       // item should be the <hbox>
       item = item.parentNode;
     }
-    if (item.id == 'rp-origin' ||
-        item.parentNode.id == 'rp-other-origins-list') {
+    if (item.id == 'rpc-origin' ||
+        item.parentNode.id == 'rpc-other-origins-list') {
       self._activateOriginItem(item);
-    } else if (item.parentNode.id == 'rp-blocked-destinations-list' ||
-               item.parentNode.id == 'rp-mixed-destinations-list' ||
-               item.parentNode.id == 'rp-allowed-destinations-list') {
+    } else if (item.parentNode.id == 'rpc-blocked-destinations-list' ||
+               item.parentNode.id == 'rpc-mixed-destinations-list' ||
+               item.parentNode.id == 'rpc-allowed-destinations-list') {
       self._activateDestinationItem(item);
     } else if (item.parentNode.id == 'rp-rule-options' ||
-               item.parentNode.id == 'rp-rules-remove' ||
-               item.parentNode.id == 'rp-rules-add') {
+               item.parentNode.id == 'rpc-rules-remove' ||
+               item.parentNode.id == 'rpc-rules-add') {
       self._processRuleSelection(item);
     } else {
       Logger.severe(Logger.TYPE_ERROR,
@@ -920,11 +920,11 @@ requestpolicy.menu = (function() {
   self._addMenuItemHelper = function(list, ruleData, fmtStrName, fmtStrArgs,
       ruleAction, cssClass) {
     var label = StringUtils.$str(fmtStrName, fmtStrArgs);
-    var item = self._addListItem(list, 'rp-od-item', label);
+    var item = self._addListItem(list, 'rpc-od-item', label);
     item.requestpolicyRuleData = ruleData;
     item.requestpolicyRuleAction = ruleAction;
     //var statustext = ''; // TODO
-    item.setAttribute('class', 'rp-od-item ' + cssClass);
+    item.setAttribute('class', 'rpc-od-item ' + cssClass);
     var canonicalRule = Ruleset.rawRuleToCanonicalString(ruleData);
     if (self._ruleChangeQueues[ruleAction]) {
       if (self._ruleChangeQueues[ruleAction][canonicalRule]) {
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 85bd25e..67528a3 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -1033,8 +1033,8 @@ requestpolicy.overlay = (function() {
     Prefs.setBlockingDisabled(disabled);
 
     // Change the link displayed in the menu.
-    $id("rp-link-enable-blocking").hidden = !disabled;
-    $id("rp-link-disable-blocking").hidden = disabled;
+    $id("rpc-link-enable-blocking").hidden = !disabled;
+    $id("rpc-link-disable-blocking").hidden = disabled;
   };
 
   /**
diff --git a/src/content/ui/xul-trees.js b/src/content/ui/xul-trees.js
index a661d7d..ba74dab 100644
--- a/src/content/ui/xul-trees.js
+++ b/src/content/ui/xul-trees.js
@@ -68,82 +68,82 @@ exports.mainTree = [
         onpopupshowing: "requestpolicy.overlay.onPopupShowing(event);",
         onpopuphidden: "requestpolicy.overlay.onPopupHidden(event);",
     children: [
-      {tag: "vbox", id: "rp-contents",
+      {tag: "vbox", id: "rpc-contents",
       children: [
-        {tag: "hbox", id: "rp-main",
+        {tag: "hbox", id: "rpc-main",
         children: [
-          {tag: "vbox", id: "rp-origins-destinations",
+          {tag: "vbox", id: "rpc-origins-destinations",
           children: [
-            {tag: "hbox", id: "rp-origin", "class": "rp-od-item",
+            {tag: "hbox", id: "rpc-origin", "class": "rpc-od-item",
                 onclick: "requestpolicy.menu.itemSelected(event);",
             children: [
-              {tag: "label", id: "rp-origin-domainname", "class": "domainname",
+              {tag: "label", id: "rpc-origin-domainname", "class": "domainname",
                   flex: "2"},
-              {tag: "label", id: "rp-origin-num-requests",
+              {tag: "label", id: "rpc-origin-num-requests",
                   "class": "numRequests"}
             ]},
-            {tag: "vbox", id: "rp-other-origins",
+            {tag: "vbox", id: "rpc-other-origins",
             children: [
-              {tag: "label", id: "rp-other-origins-title",
+              {tag: "label", id: "rpc-other-origins-title",
                   value: "&rp.menu.otherOrigins;"},
-              {tag: "vbox", id: "rp-other-origins-list",
-                  "class": "rp-label-list"}
+              {tag: "vbox", id: "rpc-other-origins-list",
+                  "class": "rpc-label-list"}
             ]},
-            {tag: "vbox", id: "rp-blocked-destinations",
+            {tag: "vbox", id: "rpc-blocked-destinations",
             children: [
-              {tag: "label", id: "rp-blocked-destinations-title",
+              {tag: "label", id: "rpc-blocked-destinations-title",
                   value: "&rp.menu.blockedDestinations;"},
-              {tag: "vbox", id: "rp-blocked-destinations-list",
-                  "class": "rp-label-list"}
+              {tag: "vbox", id: "rpc-blocked-destinations-list",
+                  "class": "rpc-label-list"}
             ]},
-            {tag: "vbox", id: "rp-mixed-destinations",
+            {tag: "vbox", id: "rpc-mixed-destinations",
             children: [
-              {tag: "label", id: "rp-mixed-destinations-title",
+              {tag: "label", id: "rpc-mixed-destinations-title",
                   value: "&rp.menu.mixedDestinations;"},
-              {tag: "vbox", id: "rp-mixed-destinations-list",
-                  "class": "rp-label-list"}
+              {tag: "vbox", id: "rpc-mixed-destinations-list",
+                  "class": "rpc-label-list"}
             ]},
-            {tag: "vbox", id: "rp-allowed-destinations",
+            {tag: "vbox", id: "rpc-allowed-destinations",
             children: [
-              {tag: "label", id: "rp-allowed-destinations-title",
+              {tag: "label", id: "rpc-allowed-destinations-title",
                   value: "&rp.menu.allowedDestinations;"},
-              {tag: "vbox", id: "rp-allowed-destinations-list",
-                  "class": "rp-label-list"}
+              {tag: "vbox", id: "rpc-allowed-destinations-list",
+                  "class": "rpc-label-list"}
             ]}
           ]},
-          {tag: "vbox", id: "rp-details",
+          {tag: "vbox", id: "rpc-details",
           children: [
-            {tag: "vbox", id: "rp-rules-remove"},
-            {tag: "vbox", id: "rp-rules-add"},
-            {tag: "vbox", id: "rp-rules-info"}
+            {tag: "vbox", id: "rpc-rules-remove"},
+            {tag: "vbox", id: "rpc-rules-add"},
+            {tag: "vbox", id: "rpc-rules-info"}
           ]}
         ]},
-        {tag: "hbox", id: "rp-revoke-temporary-permissions", hidden: "true",
+        {tag: "hbox", id: "rpc-revoke-temporary-permissions", hidden: "true",
         children: [
           {tag: "label", value: "&rp.menu.revokeTemporaryPermissions;",
               onclick: "requestpolicy.overlay.revokeTemporaryPermissions();"}
         ]},
-        {tag: "hbox", id: "rp-footer",
+        {tag: "hbox", id: "rpc-footer",
         children: [
-          {tag: "hbox", id: "rp-footer-links",
+          {tag: "hbox", id: "rpc-footer-links",
           children: [
-            {tag: "label", id: "rp-link-enable-blocking",
-                "class": "rp-footer-link", value: "&rp.menu.enableBlocking;",
+            {tag: "label", id: "rpc-link-enable-blocking",
+                "class": "rpc-footer-link", value: "&rp.menu.enableBlocking;",
                 onclick: "requestpolicy.overlay.toggleTemporarilyAllowAll();"},
-            {tag: "label", id: "rp-link-disable-blocking",
-                "class": "rp-footer-link", value: "&rp.menu.disableBlocking;",
+            {tag: "label", id: "rpc-link-disable-blocking",
+                "class": "rpc-footer-link", value: "&rp.menu.disableBlocking;",
                 onclick: "requestpolicy.overlay.toggleTemporarilyAllowAll();"},
-            {tag: "label", id: "rp-link-help", "class": "rp-footer-link",
+            {tag: "label", id: "rpc-link-help", "class": "rpc-footer-link",
                 value: "&rp.menu.help;",
                 onclick: "requestpolicy.overlay.openHelp();"},
-            {tag: "label", id: "rp-link-prefs", "class": "rp-footer-link",
+            {tag: "label", id: "rpc-link-prefs", "class": "rpc-footer-link",
                 value: "&rp.menu.preferences;",
                 onclick: "requestpolicy.overlay.openPrefs(event);"},
-            {tag: "label", id: "rp-link-policies", "class": "rp-footer-link",
+            {tag: "label", id: "rpc-link-policies", "class": "rpc-footer-link",
                 value: "&rp.menu.managePolicies;",
                 onclick: "requestpolicy.overlay.openPolicyManager();"},
-            {tag: "label", id: "rp-link-request-log", "class": "rp-footer-link",
-                value: "&rp.requestLog.title;",
+            {tag: "label", id: "rpc-link-request-log",
+                "class": "rpc-footer-link", value: "&rp.requestLog.title;",
                 onclick: "requestpolicy.overlay.toggleRequestLog(event);"}
           ]}
         ]}
diff --git a/src/skin/requestpolicy.css b/src/skin/requestpolicy.css
index d1e4959..e548b4f 100644
--- a/src/skin/requestpolicy.css
+++ b/src/skin/requestpolicy.css
@@ -7,21 +7,21 @@
   margin: 0;
   font-family: Helvetica, sans-serif;
 }
-#rp-contents {
+#rpc-contents {
   background-color: #ffffff;
 }
-#rp-main {
+#rpc-main {
   padding: 10px 10px 10px 10px;
   font-size: 13px;
 }
 
-#rp-origins-destinations {
+#rpc-origins-destinations {
   width : 200px;
   margin-right: 10px;
 }
 
 /*
-#rp-origins-destinations .rp-od-item {
+#rpc-origins-destinations .rpc-od-item {
   border: 1px solid #ffffff;
   border-right: 0;
   padding: 2px 0 2px 8px;
@@ -30,229 +30,229 @@
   border-bottom-left-radius: 3px;
 }
 */
-.rp-od-item {
+.rpc-od-item {
   border: 1px solid #ffffff;
   padding: 0 12px 0 12px;
   margin: 0px 4px 0px 4px;
   border-radius: 3px;
 }
 
-#rp-origins-destinations [selected-origin="true"] {
+#rpc-origins-destinations [selected-origin="true"] {
   border-color: #ddd !important;
   background-color: #eaeaea;
 }
-#rp-origins-destinations [selected-origin="false"]:hover {
+#rpc-origins-destinations [selected-origin="false"]:hover {
   border-color: #eee !important;
   background-color: #f1f1f1;
 }
 
 
-#rp-blocked-destinations [default-policy="true"],
-#rp-allowed-destinations [default-policy="true"] {
+#rpc-blocked-destinations [default-policy="true"],
+#rpc-allowed-destinations [default-policy="true"] {
   background-image: url(chrome://rpcontinued/skin/menu-default.svg);
 }
-#rp-blocked-destinations [default-policy="false"] {
+#rpc-blocked-destinations [default-policy="false"] {
   background-image: url(chrome://rpcontinued/skin/menu-blocked.svg);
 }
-#rp-allowed-destinations [default-policy="false"] {
+#rpc-allowed-destinations [default-policy="false"] {
   background-image: url(chrome://rpcontinued/skin/menu-allowed.svg);
 }
-#rp-blocked-destinations [default-policy],
-#rp-allowed-destinations [default-policy] {
+#rpc-blocked-destinations [default-policy],
+#rpc-allowed-destinations [default-policy] {
   background-position: left center;
   background-repeat: no-repeat;
   background-size: 14px 14px;
   padding-left: 20px;
 }
 
-#rp-blocked-destinations [selected-dest="true"] {
+#rpc-blocked-destinations [selected-dest="true"] {
   border-color: #edd !important;
   background-color: #ffe1e1;
 }
-#rp-blocked-destinations [selected-dest="false"]:hover {
+#rpc-blocked-destinations [selected-dest="false"]:hover {
   border-color: #fee !important;
   background-color: #fff1f1;
 }
 
-#rp-mixed-destinations [selected-dest="true"] {
+#rpc-mixed-destinations [selected-dest="true"] {
   border-color: #F2E2C7 !important;
   background-color: #FFF3DE;
 }
-#rp-mixed-destinations [selected-dest="false"]:hover {
+#rpc-mixed-destinations [selected-dest="false"]:hover {
   border-color: #FFF3DE !important;
   background-color: #FFFAF2;
 }
 
-#rp-allowed-destinations [selected-dest="true"] {
+#rpc-allowed-destinations [selected-dest="true"] {
   border-color: #ded !important;
   background-color: #e1ffe1;
 }
-#rp-allowed-destinations [selected-dest="false"]:hover {
+#rpc-allowed-destinations [selected-dest="false"]:hover {
   border-color: #efe !important;
   background-color: #f1fff1;
 }
 
-#rp-details .rp-od-item:hover {
+#rpc-details .rpc-od-item:hover {
   border-color: #eee !important;
   background-color: #f1f1f1;
 }
-#rp-details .rp-allow {
+#rpc-details .rp-allow {
   /* This should probably stay the same color as the allowed destinations. */
   color: #484;
 }
-#rp-details .rp-deny {
+#rpc-details .rp-deny {
   /* This should probably stay the same color as the blocked destinations. */
   color: #844;
 }
-#rp-details .rp-temporary {
+#rpc-details .rp-temporary {
   font-style: italic;
   font-size: 0.9em;
   color: #999;
 }
 /* When in private browsing mode, the user only has the option of adding
    temporary rules. So, don't show them only small, grey text. */
-#rp-details.privatebrowsing .rp-allow {
+#rpc-details.privatebrowsing .rp-allow {
   font-size: 1em;
   color: #484;
 }
-#rp-details.privatebrowsing .rp-deny {
+#rpc-details.privatebrowsing .rp-deny {
   font-size: 1em;
   color: #844;
 }
 
 
 
-#rp-details .rp-stop-rule[selected-rule="true"] {
+#rpc-details .rp-stop-rule[selected-rule="true"] {
   text-decoration: underline;
 }
 
-#rp-details .rp-start-rule[selected-rule="true"] {
+#rpc-details .rp-start-rule[selected-rule="true"] {
   text-decoration: underline;
 }
 
-#rp-rules-remove label:last-child {
+#rpc-rules-remove label:last-child {
   margin-bottom: 14px;
 }
 
-#rp-origin #rp-origin-domainname {
+#rpc-origin #rpc-origin-domainname {
   font-size: 1.2em;
   color : #555;
   padding-right: 10px;
 }
-#rp-origin #rp-origin-num-requests {
+#rpc-origin #rpc-origin-num-requests {
   font-size: 1.2em;
   color: #777;
 }
-#rp-origin[requests-blocked="true"] {
+#rpc-origin[requests-blocked="true"] {
   background-image:
     url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
 }
-#rp-origin[requests-blocked="false"] {
+#rpc-origin[requests-blocked="false"] {
   background-image:
     url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
 }
-#rp-origin[requests-blocked] {
+#rpc-origin[requests-blocked] {
   background-position: left center;
   background-repeat: no-repeat;
   background-size: 14px 14px;
   padding-left: 20px;
 }
 
-.rp-label-list {
+.rpc-label-list {
   /*margin-left : 10px;*/
 }
-#rp-other-origins {
+#rpc-other-origins {
   color: #444;
   margin-top: 1em;
   padding-bottom: 1em;
   border-bottom: 1px solid #eee;
 }
-#rp-other-origins [requests-blocked="true"] {
+#rpc-other-origins [requests-blocked="true"] {
   background-image:
     url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
 }
-#rp-other-origins [requests-blocked="false"] {
+#rpc-other-origins [requests-blocked="false"] {
   background-image:
     url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
 }
-#rp-other-origins [requests-blocked] {
+#rpc-other-origins [requests-blocked] {
   background-position: left center;
   background-repeat: no-repeat;
   background-size: 14px 14px;
   padding-left: 20px;
 }
 
-#rp-other-origins-title {
+#rpc-other-origins-title {
   color: #aaa;
 }
 
-#rp-blocked-destinations {
+#rpc-blocked-destinations {
   color: #844;
   margin-top: 1em;
 }
-#rp-blocked-destinations-title {
+#rpc-blocked-destinations-title {
   color: #caa;
 }
 
-#rp-mixed-destinations {
+#rpc-mixed-destinations {
   color: #AA7215;
   margin-top: 1em;
 }
-#rp-mixed-destinations-title {
+#rpc-mixed-destinations-title {
   color: #CCAF7D;
 }
 
-#rp-allowed-destinations {
+#rpc-allowed-destinations {
   color: #484;
   margin-top: 1em;
 }
-#rp-allowed-destinations-title {
+#rpc-allowed-destinations-title {
   color: #aca;
 }
 
-#rp-details {
+#rpc-details {
   padding: 0 1em 0 1em;
   border-left: 1px solid #eee;
   width: 500px !important;
 }
 
-#rp-revoke-temporary-permissions {
+#rpc-revoke-temporary-permissions {
   border-top: 1px solid #ddd;
   padding: 7px 5px 9px 5px;
   -moz-box-pack: center;
 }
-#rp-revoke-temporary-permissions label {
+#rpc-revoke-temporary-permissions label {
   color: #2550ba;
   font-size: 14px;
   margin: 0 10px 0 10px;
 }
-#rp-revoke-temporary-permissions label:hover {
+#rpc-revoke-temporary-permissions label:hover {
   text-decoration: underline;
   cursor: pointer;
 }
 
-#rp-footer {
+#rpc-footer {
   border-top: 1px solid #ddd;
   padding: 0 5px 2px 5px;
   -moz-box-pack: end;
 }
-#rp-footer-links {
+#rpc-footer-links {
   margin-top: 4px;
 }
-.rp-footer-link {
+.rpc-footer-link {
   color: #888;
   font-size: 11px;
   margin: 0 10px 0 10px;
 }
-.rp-footer-link:hover {
+.rpc-footer-link:hover {
   color: #555;
   text-decoration: underline;
   cursor: pointer;
 }
-#rp-link-disable-blocking {
+#rpc-link-disable-blocking {
   color: #000;
 }
-#rp-link-enable-blocking {
+#rpc-link-enable-blocking {
   color: #966803;
 }
 
diff --git a/tests/mozmill/lib/request-log-utils.js b/tests/mozmill/lib/request-log-utils.js
index 1696d00..de1ede0 100644
--- a/tests/mozmill/lib/request-log-utils.js
+++ b/tests/mozmill/lib/request-log-utils.js
@@ -25,7 +25,7 @@ RequestLog.prototype.open = function () {
     menu.open();
 
     // open the request log
-    findElement.ID(this.windowDoc, "rp-link-request-log").click();
+    findElement.ID(this.windowDoc, "rpc-link-request-log").click();
 
     // close the menu
     menu.close();
diff --git a/tests/mozmill/tests/testPolicy/lib/num-request-counter.js b/tests/mozmill/tests/testPolicy/lib/num-request-counter.js
index defe4c6..4e8a552 100644
--- a/tests/mozmill/tests/testPolicy/lib/num-request-counter.js
+++ b/tests/mozmill/tests/testPolicy/lib/num-request-counter.js
@@ -68,14 +68,14 @@ function NumRequestsCounter(controller) {
 
     {
       let rpOriginNumReq = rpUtils.getElementById(controller.window.document,
-                                                  "rp-origin-num-requests");
+                                                  "rpc-origin-num-requests");
       let total = counter.$total.$total;
       let totalAllow = counter.$total.allowed;
       let totalDeny = counter.$total.denied;
 
       let re = /^\s*([0-9]+)\s*(?:\(\s*([0-9]+)\s*\+\s*([0-9]+)\s*\))?\s*$/;
       let reResult = re.exec(rpOriginNumReq.value);
-      assert.ok(reResult !== null, "The numRequests field of #rp-origin " +
+      assert.ok(reResult !== null, "The numRequests field of #rpc-origin " +
                 "has the correct format, either 'num' or 'num (num + num)'.");
       assert.ok(reResult[1] > total, "The total number of requests" +
                 " is correct.");

-- 
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