[Pkg-mozext-commits] [requestpolicy] 22/80: rename `rp-popup` to `rpc-popup`

[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 3b53347c36fb2c897b054e8ba2f3ade4b3e3b20c
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue May 12 02:23:22 2015 +0200

    rename `rp-popup` to `rpc-popup`
---
 src/content/ui/overlay.js                                 |  2 +-
 src/content/ui/xul-trees.js                               |  4 ++--
 src/skin/requestpolicy.css                                |  2 +-
 tests/mozmill/lib/menu-utils.js                           |  2 +-
 tests/mozmill/tests/testPolicy/lib/num-request-counter.js | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 60349b0..f8590de 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -117,7 +117,7 @@ requestpolicy.overlay = (function() {
 
         requestpolicy.menu.init();
 
-        popupElement = $id("rp-popup");
+        popupElement = $id("rpc-popup");
 
         //statusbar = $id("status-bar");
         //rpContextMenu = $id("rpcontinuedContextMenu");
diff --git a/src/content/ui/xul-trees.js b/src/content/ui/xul-trees.js
index 91c9c5f..a8cc3f4 100644
--- a/src/content/ui/xul-trees.js
+++ b/src/content/ui/xul-trees.js
@@ -31,7 +31,7 @@ exports.toolbarbutton = [
       tree: ["palette"]}}, // ("#navigator-toolbox".palette)
     tag: "toolbarbutton", id: "rpcontinuedToolbarButton",
     label: "RequestPolicy", tooltiptext: "RequestPolicy Continued",
-    popup: "rp-popup"
+    popup: "rpc-popup"
   }
 ];
 
@@ -64,7 +64,7 @@ exports.mainTree = [
       tag: "popupset", id: "requestpolicyPopupset",
   children: [
     {tag: "menupopup", id: "requestpolicyRedirectAddRuleMenu"},
-    {tag: "menupopup", id: "rp-popup", noautohide: "true",
+    {tag: "menupopup", id: "rpc-popup", noautohide: "true",
         position: "after_start",
         onpopupshowing: "requestpolicy.overlay.onPopupShowing(event);",
         onpopuphidden: "requestpolicy.overlay.onPopupHidden(event);",
diff --git a/src/skin/requestpolicy.css b/src/skin/requestpolicy.css
index 9e66328..d1e4959 100644
--- a/src/skin/requestpolicy.css
+++ b/src/skin/requestpolicy.css
@@ -2,7 +2,7 @@
 /*********************************************
  * Menu contents
  *********************************************/
-#rp-popup {
+#rpc-popup {
   padding: 0;
   margin: 0;
   font-family: Helvetica, sans-serif;
diff --git a/tests/mozmill/lib/menu-utils.js b/tests/mozmill/lib/menu-utils.js
index eaff551..f079f7e 100644
--- a/tests/mozmill/lib/menu-utils.js
+++ b/tests/mozmill/lib/menu-utils.js
@@ -22,7 +22,7 @@ function Menu(aController) {
  * @return {MozMillElement}
  */
 Menu.prototype.getPopup = function () {
-  return findElement.ID(this.window.document, "rp-popup");
+  return findElement.ID(this.window.document, "rpc-popup");
 };
 
 /**
diff --git a/tests/mozmill/tests/testPolicy/lib/num-request-counter.js b/tests/mozmill/tests/testPolicy/lib/num-request-counter.js
index 5a89668..defe4c6 100644
--- a/tests/mozmill/tests/testPolicy/lib/num-request-counter.js
+++ b/tests/mozmill/tests/testPolicy/lib/num-request-counter.js
@@ -18,9 +18,9 @@ function NumRequestsCounter(controller) {
 
   let self = this;
 
-  let rpMenuButton = findElement.ID(controller.window.document,
+  let rpcMenuButton = findElement.ID(controller.window.document,
                                     'rpcontinuedToolbarButton');
-  let rpMenuPopup = findElement.ID(controller.window.document, 'rp-popup');
+  let rpcMenuPopup = findElement.ID(controller.window.document, 'rpc-popup');
 
 
   function initOriginAndDest(originHostname, destHostname) {
@@ -63,8 +63,8 @@ function NumRequestsCounter(controller) {
 
   self.checkIfIsCorrect = function() {
     // open the menu
-    rpMenuButton.click();
-    rpMenuPopup.waitForElement();
+    rpcMenuButton.click();
+    rpcMenuPopup.waitForElement();
 
     {
       let rpOriginNumReq = rpUtils.getElementById(controller.window.document,
@@ -108,7 +108,7 @@ function NumRequestsCounter(controller) {
      */
 
     // close the menu
-    rpMenuPopup.keypress('VK_ESCAPE');
+    rpcMenuPopup.keypress('VK_ESCAPE');
   };
 
   return self;

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