[Pkg-mozext-commits] [requestpolicy] 35/80: Rename the object added to "browser" objects

David Prévot taffit at moszumanska.debian.org
Sun Jul 5 15:02:27 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 8dd525934eb6ef7581cc224ed008b4dbd10ac8c1
Author: Martin Kimmerle <dev at 256k.de>
Date:   Thu May 14 03:10:16 2015 +0200

    Rename the object added to "browser" objects
---
 src/content/lib/request-processor.jsm            |  2 +-
 src/content/lib/request-processor.redirects.js   |  6 ++--
 src/content/main/window-manager-toolbarbutton.js |  2 +-
 src/content/main/window-manager.jsm              |  8 ++---
 src/content/ui/classicmenu.js                    | 32 +++++++++---------
 src/content/ui/menu.js                           |  8 ++---
 src/content/ui/overlay.js                        | 42 ++++++++++++------------
 src/content/ui/request-log.filtering.js          |  4 +--
 src/content/ui/request-log.interface.js          |  6 ++--
 src/content/ui/request-log.js                    |  8 ++---
 src/content/ui/request-log.tree-view.js          |  6 ++--
 src/content/ui/request-log.xul                   | 12 +++----
 src/content/ui/xul-trees.js                      | 32 +++++++++---------
 13 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index c944332..1bb77f6 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -161,7 +161,7 @@ let RequestProcessor = (function(self) {
         Logger.warning(Logger.TYPE_CONTENT, "The user could not be notified " +
             "about the blocked top-level document request!");
       } else {
-        window.requestpolicy.overlay.observeBlockedTopLevelDocRequest(
+        window.rpcontinued.overlay.observeBlockedTopLevelDocRequest(
             browser, request.originURI, request.destURI);
       }
     }
diff --git a/src/content/lib/request-processor.redirects.js b/src/content/lib/request-processor.redirects.js
index fd3ef78..f848183 100644
--- a/src/content/lib/request-processor.redirects.js
+++ b/src/content/lib/request-processor.redirects.js
@@ -236,8 +236,8 @@ let RequestProcessor = (function(self) {
           // save all blocked redirects directly in the browser element. the
           // blocked elements will be checked later when the DOM content
           // finished loading.
-          browser.requestpolicy = browser.requestpolicy || {blockedRedirects: {}};
-          browser.requestpolicy.blockedRedirects[originURI] = destURI;
+          browser.rpcontinued = browser.rpcontinued || {blockedRedirects: {}};
+          browser.rpcontinued.blockedRedirects[originURI] = destURI;
         }
 
         // Cancel the request. As of Fx 37, this causes the location bar to
@@ -305,7 +305,7 @@ let RequestProcessor = (function(self) {
     var window = browser.ownerGlobal;
 
     Utils.tryMultipleTimes(function() {
-      var showNotification = Utils.getObjectPath(window, 'requestpolicy',
+      var showNotification = Utils.getObjectPath(window, 'rpcontinued',
           'overlay', '_showRedirectNotification');
       if (!showNotification) {
         return false;
diff --git a/src/content/main/window-manager-toolbarbutton.js b/src/content/main/window-manager-toolbarbutton.js
index 8bd478f..5a2ea5f 100644
--- a/src/content/main/window-manager-toolbarbutton.js
+++ b/src/content/main/window-manager-toolbarbutton.js
@@ -67,7 +67,7 @@ let rpWindowManager = (function(self) {
       onCommand : function(aEvent) {
         // Bad smell
         let win = aEvent.target.ownerDocument.defaultView;
-        win.requestpolicy.overlay.openToolbarPopup(aEvent.target);
+        win.rpcontinued.overlay.openToolbarPopup(aEvent.target);
       }
     });
   }
diff --git a/src/content/main/window-manager.jsm b/src/content/main/window-manager.jsm
index a70d2ab..b47b3f1 100644
--- a/src/content/main/window-manager.jsm
+++ b/src/content/main/window-manager.jsm
@@ -77,7 +77,7 @@ let rpWindowManager = (function(self) {
     // ==================================
     // # 2 : create a scope variable for RP for this window
     // ----------------------------------------------------
-    window.requestpolicy = {};
+    window.rpcontinued = {};
 
 
     // ==================================
@@ -116,7 +116,7 @@ let rpWindowManager = (function(self) {
     try {
       // init must be called last, because it assumes that
       // everything else is ready
-      window.requestpolicy.overlay.init();
+      window.rpcontinued.overlay.init();
     } catch (e) {
       Logger.warning(Logger.TYPE_ERROR,
                      "An error occurred while initializing the overlay: "+e, e);
@@ -133,11 +133,11 @@ let rpWindowManager = (function(self) {
     self.removeToolbarButtonFromWindow(window);
 
 
-    // # 3 and 2 : remove the `requestpolicy` variable from the window
+    // # 3 and 2 : remove the `rpcontinued` variable from the window
     // ---------------------------------------------------------
     // This wouldn't be needed when the window is closed, but this has to be
     // done when RP is being disabled.
-    delete window.requestpolicy;
+    delete window.rpcontinued;
 
 
     // # 1 : remove all XUL elements
diff --git a/src/content/ui/classicmenu.js b/src/content/ui/classicmenu.js
index 3bb3039..a03ca79 100644
--- a/src/content/ui/classicmenu.js
+++ b/src/content/ui/classicmenu.js
@@ -24,7 +24,7 @@
 
 
 
-requestpolicy.classicmenu = (function() {
+rpcontinued.classicmenu = (function() {
   let self = {};
 
   const Ci = Components.interfaces;
@@ -62,7 +62,7 @@ requestpolicy.classicmenu = (function() {
     var menuItem = document.createElement("menuitem");
     menuItem.setAttribute("label", label);
     oncommand = oncommand +
-        " requestpolicy.classicmenu._conditionallyReloadDocument();";
+        " rpcontinued.classicmenu._conditionallyReloadDocument();";
     menuItem.setAttribute("oncommand", oncommand);
     // menuItem.setAttribute("tooltiptext", node.getAttribute("tooltiptext"));
     menu.insertBefore(menuItem, menu.firstChild);
@@ -72,8 +72,8 @@ requestpolicy.classicmenu = (function() {
 
   self.addMenuItemTemporarilyAllowOrigin = function(menu, originHost) {
     var label = StringUtils.$str("allowOriginTemporarily", [originHost]);
-    var command = "requestpolicy.overlay.temporarilyAllowOrigin('"
-        + requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "');";
+    var command = "rpcontinued.overlay.temporarilyAllowOrigin('"
+        + rpcontinued.menu._sanitizeJsFunctionArg(originHost) + "');";
     var item = self.addMenuItem(menu, label, command);
     item.setAttribute("class", "rpcontinuedTemporary");
     return item;
@@ -81,8 +81,8 @@ requestpolicy.classicmenu = (function() {
 
   self.addMenuItemAllowOrigin = function(menu, originHost) {
     var label = StringUtils.$str("allowOrigin", [originHost]);
-    var command = "requestpolicy.overlay.allowOrigin('"
-        + requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "');";
+    var command = "rpcontinued.overlay.allowOrigin('"
+        + rpcontinued.menu._sanitizeJsFunctionArg(originHost) + "');";
     return self.addMenuItem(menu, label, command);
   };
 
@@ -91,9 +91,9 @@ requestpolicy.classicmenu = (function() {
                                                      destHost) {
     var label = StringUtils.$str("allowOriginToDestinationTemporarily",
                                  [originHost, destHost]);
-    var command = "requestpolicy.overlay.temporarilyAllowOriginToDestination('"
-        + requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "', '"
-        + requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
+    var command = "rpcontinued.overlay.temporarilyAllowOriginToDestination('"
+        + rpcontinued.menu._sanitizeJsFunctionArg(originHost) + "', '"
+        + rpcontinued.menu._sanitizeJsFunctionArg(destHost) + "');";
     var item = self.addMenuItem(menu, label, command);
     item.setAttribute("class", "rpcontinuedTemporary");
     return item;
@@ -102,9 +102,9 @@ requestpolicy.classicmenu = (function() {
   self.addMenuItemAllowOriginToDest = function(menu, originHost, destHost) {
     var label = StringUtils.$str("allowOriginToDestination",
                                  [originHost, destHost]);
-    var command = "requestpolicy.overlay.allowOriginToDestination('"
-        + requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "', '"
-        + requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
+    var command = "rpcontinued.overlay.allowOriginToDestination('"
+        + rpcontinued.menu._sanitizeJsFunctionArg(originHost) + "', '"
+        + rpcontinued.menu._sanitizeJsFunctionArg(destHost) + "');";
     var item = self.addMenuItem(menu, label, command);
     item.setAttribute("class", "rpcontinuedAllowOriginToDest");
     return item;
@@ -113,8 +113,8 @@ requestpolicy.classicmenu = (function() {
 
   self.addMenuItemTemporarilyAllowDest = function(menu, destHost) {
     var label = StringUtils.$str("allowDestinationTemporarily", [destHost]);
-    var command = "requestpolicy.overlay.temporarilyAllowDestination('"
-        + requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
+    var command = "rpcontinued.overlay.temporarilyAllowDestination('"
+        + rpcontinued.menu._sanitizeJsFunctionArg(destHost) + "');";
     var item = self.addMenuItem(menu, label, command);
     item.setAttribute("class", "rpcontinuedTemporary");
     return item;
@@ -122,8 +122,8 @@ requestpolicy.classicmenu = (function() {
 
   self.addMenuItemAllowDest = function(menu, destHost) {
     var label = StringUtils.$str("allowDestination", [destHost]);
-    var command = "requestpolicy.overlay.allowDestination('"
-        + requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
+    var command = "rpcontinued.overlay.allowDestination('"
+        + rpcontinued.menu._sanitizeJsFunctionArg(destHost) + "');";
     return self.addMenuItem(menu, label, command);
   };
 
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index 8d1ce36..d9dbfc7 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -22,7 +22,7 @@
  */
 
 
-requestpolicy.menu = (function() {
+rpcontinued.menu = (function() {
 
   const Ci = Components.interfaces;
   const Cc = Components.classes;
@@ -108,7 +108,7 @@ requestpolicy.menu = (function() {
       $id('rpc-revoke-temporary-permissions').hidden =
           !PolicyManager.temporaryRulesExist();
 
-      self._currentUri = requestpolicy.overlay.getTopLevelDocumentUri();
+      self._currentUri = rpcontinued.overlay.getTopLevelDocumentUri();
 
       try {
         self._currentBaseDomain = DomainUtil.getBaseDomain(self._currentUri);
@@ -125,7 +125,7 @@ requestpolicy.menu = (function() {
         return;
       }
 
-      self._currentIdentifier = requestpolicy.overlay
+      self._currentIdentifier = rpcontinued.overlay
           .getTopLevelDocumentUriIdentifier();
 
       //Logger.info(Logger.TYPE_POLICY,
@@ -446,7 +446,7 @@ requestpolicy.menu = (function() {
   self._addListItem = function(list, cssClass, value, numRequests) {
     var hbox = document.createElement("hbox");
     hbox.setAttribute("class", cssClass);
-    hbox.setAttribute("onclick", 'requestpolicy.menu.itemSelected(event);');
+    hbox.setAttribute("onclick", 'rpcontinued.menu.itemSelected(event);');
     list.insertBefore(hbox, null);
 
     var destLabel = document.createElement("label");
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 6c0b935..db82c5e 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -26,7 +26,7 @@
  * Provides functionality for the overlay. An instance of this class exists for
  * each tab/window.
  */
-requestpolicy.overlay = (function() {
+rpcontinued.overlay = (function() {
 
   const Ci = Components.interfaces;
   const Cc = Components.classes;
@@ -103,7 +103,7 @@ requestpolicy.overlay = (function() {
 
 
   self.toString = function() {
-    return "[requestpolicy.overlay " + overlayId + "]";
+    return "[rpcontinued.overlay " + overlayId + "]";
   };
 
   /**
@@ -115,7 +115,7 @@ requestpolicy.overlay = (function() {
         initialized = true;
         overlayId = (new Date()).getTime();
 
-        requestpolicy.menu.init();
+        rpcontinued.menu.init();
 
         popupElement = $id("rpc-popup");
 
@@ -156,7 +156,7 @@ requestpolicy.overlay = (function() {
       Logger.severe(Logger.TYPE_ERROR,
           "Fatal Error, " + e + ", stack was: " + e.stack);
       Logger.severe(Logger.TYPE_ERROR,
-          "Unable to initialize requestpolicy.overlay.");
+          "Unable to initialize rpcontinued.overlay.");
       throw e;
     }
   };
@@ -282,16 +282,16 @@ requestpolicy.overlay = (function() {
       }
     }
 
-    if ("requestpolicy" in browser &&
-        documentURI in browser.requestpolicy.blockedRedirects) {
+    if ("rpcontinued" in browser &&
+        documentURI in browser.rpcontinued.blockedRedirects) {
       // bad smell: do not save blocked requests in the <browser> obj
-      var dest = browser.requestpolicy.blockedRedirects[documentURI];
+      var dest = browser.rpcontinued.blockedRedirects[documentURI];
       Logger.warning(Logger.TYPE_HEADER_REDIRECT,
           "Showing notification for blocked redirect. To <" + dest +
           "> " + "from <" + documentURI + ">");
       self._showRedirectNotification(browser, dest);
 
-      delete browser.requestpolicy.blockedRedirects[documentURI];
+      delete browser.rpcontinued.blockedRedirects[documentURI];
     }
 
     // send the list of blocked URIs back to the frame script
@@ -474,7 +474,7 @@ requestpolicy.overlay = (function() {
     var addRulePopup = $id(addRuleMenuName);
     DOMUtils.removeChildren(addRulePopup);
 
-    let m = requestpolicy.menu;
+    let m = rpcontinued.menu;
     var originBaseDomain = DomainUtil.getBaseDomain(redirectOriginUri);
     var destBaseDomain = DomainUtil.getBaseDomain(redirectTargetUri);
 
@@ -488,7 +488,7 @@ requestpolicy.overlay = (function() {
 
     let mayPermRulesBeAdded = WindowUtils.mayPermanentRulesBeAdded(window);
 
-    let cm = requestpolicy.classicmenu;
+    let cm = rpcontinued.classicmenu;
 
     if (destBaseDomain !== null) {
       cm.addMenuItemTemporarilyAllowDest(addRulePopup, dest);
@@ -700,7 +700,7 @@ requestpolicy.overlay = (function() {
     // This function is called during shouldLoad() so set a timeout to
     // avoid blocking shouldLoad.
     window.setTimeout(function() {
-      requestpolicy.overlay._showRedirectNotification(browser, destUri, 0);
+      rpcontinued.overlay._showRedirectNotification(browser, destUri, 0);
     }, 0);
   };
 
@@ -715,7 +715,7 @@ requestpolicy.overlay = (function() {
   self._updateBlockedContentStateAfterTimeout = function() {
     const browser = gBrowser.selectedBrowser;
     blockedContentCheckTimeoutId = window.setTimeout(function() {
-      requestpolicy.overlay._updateBlockedContentState(browser);
+      rpcontinued.overlay._updateBlockedContentState(browser);
     }, blockedContentStateUpdateDelay);
   };
 
@@ -731,8 +731,8 @@ requestpolicy.overlay = (function() {
    * contentAreaContextMenu.
    */
   self._contextMenuOnPopupShowing = function() {
-    requestpolicy.overlay._wrapOpenLink();
-    /*requestpolicy.overlay._attachPopupToContextMenu();*/
+    rpcontinued.overlay._wrapOpenLink();
+    /*rpcontinued.overlay._attachPopupToContextMenu();*/
   };
 
   /**
@@ -817,7 +817,7 @@ requestpolicy.overlay = (function() {
       // We use 'arguments' so that we aren't dependent on the names of two
       // parameters, as it seems not unlikely that these could change due to
       // the second parameter's purpose having been changed.
-      var newFirstCodeLine = "\n    requestpolicy.overlay.tabAdded(arguments[0], arguments[1]);";
+      var newFirstCodeLine = "\n    rpcontinued.overlay.tabAdded(arguments[0], arguments[1]);";
       // Finally, add our line to the beginning of the addTab function.
       eval("gBrowser.addTab = " + addTabParts[0] + newFirstCodeLine +
            addTabParts[1]);
@@ -833,7 +833,7 @@ requestpolicy.overlay = (function() {
 
       // define the regular expression that should find the existing code
       // line that RequestPolicy added.
-      let codeLineRE = /(\n    )?requestpolicy\.overlay\.tabAdded\(arguments\[0\], arguments\[1\]\);/;
+      let codeLineRE = /(\n    )?rpcontinued\.overlay\.tabAdded\(arguments\[0\], arguments\[1\]\);/;
 
       // use the regular expression
       let newAddTabString = addTabString.replace(codeLineRE, "");
@@ -874,8 +874,8 @@ requestpolicy.overlay = (function() {
         // This gets called both for tab changes and for history navigation.
         // The timer is running on the main window, not the document's window,
         // so we want to stop the timer when the tab is changed.
-        requestpolicy.overlay._stopBlockedContentCheckTimeout();
-        requestpolicy.overlay
+        rpcontinued.overlay._stopBlockedContentCheckTimeout();
+        rpcontinued.overlay
             ._updateBlockedContentState(gBrowser.selectedBrowser);
       },
 
@@ -977,7 +977,7 @@ requestpolicy.overlay = (function() {
   //    if (event.currentTarget != event.originalTarget) {
   //      return;
   //    }
-    requestpolicy.menu.prepareMenu();
+    rpcontinued.menu.prepareMenu();
   };
 
   /**
@@ -987,7 +987,7 @@ requestpolicy.overlay = (function() {
    *          event
    */
   self.onPopupHidden = function(event) {
-    var rulesChanged = requestpolicy.menu.processQueuedRuleChanges();
+    var rulesChanged = rpcontinued.menu.processQueuedRuleChanges();
     if (rulesChanged || self._needsReloadOnMenuClose) {
       if (rpPrefBranch.getBoolPref("autoReload")) {
         let mm = gBrowser.selectedBrowser.messageManager;
@@ -1176,7 +1176,7 @@ requestpolicy.overlay = (function() {
   //  },
 
   self.openToolbarPopup = function(anchor) {
-  //    requestpolicy.overlay._toolbox.insertBefore(requestpolicy.overlay.popupElement,
+  //    rpcontinued.overlay._toolbox.insertBefore(rpcontinued.overlay.popupElement,
   //        null);
     popupElement.openPopup(anchor, "after_start", 0, 0, true, true);
   };
diff --git a/src/content/ui/request-log.filtering.js b/src/content/ui/request-log.filtering.js
index d3afc3a..f288d17 100644
--- a/src/content/ui/request-log.filtering.js
+++ b/src/content/ui/request-log.filtering.js
@@ -22,7 +22,7 @@
  */
 
 
-window.requestpolicy.requestLog = (function (self) {
+window.rpcontinued.requestLog = (function (self) {
 
   const Ci = Components.interfaces;
   const Cc = Components.classes;
@@ -107,4 +107,4 @@ window.requestpolicy.requestLog = (function (self) {
 
 
   return self;
-}(window.requestpolicy.requestLog || {}));
+}(window.rpcontinued.requestLog || {}));
diff --git a/src/content/ui/request-log.interface.js b/src/content/ui/request-log.interface.js
index 6891f39..dfaf643 100644
--- a/src/content/ui/request-log.interface.js
+++ b/src/content/ui/request-log.interface.js
@@ -21,9 +21,9 @@
  * ***** END LICENSE BLOCK *****
  */
 
-window.requestpolicy = window.requestpolicy || {};
+window.rpcontinued = window.rpcontinued || {};
 
-window.requestpolicy.requestLog = (function (self) {
+window.rpcontinued.requestLog = (function (self) {
 
   const Ci = Components.interfaces;
   const Cc = Components.classes;
@@ -131,4 +131,4 @@ window.requestpolicy.requestLog = (function (self) {
 
 
   return self;
-}(window.requestpolicy.requestLog || {}));
+}(window.rpcontinued.requestLog || {}));
diff --git a/src/content/ui/request-log.js b/src/content/ui/request-log.js
index ea3c1c1..efd67cc 100644
--- a/src/content/ui/request-log.js
+++ b/src/content/ui/request-log.js
@@ -21,9 +21,9 @@
  * ***** END LICENSE BLOCK *****
  */
 
-window.requestpolicy = window.requestpolicy || {};
+window.rpcontinued = window.rpcontinued || {};
 
-window.requestpolicy.requestLog = (function (self) {
+window.rpcontinued.requestLog = (function (self) {
 
   const Ci = Components.interfaces;
   const Cc = Components.classes;
@@ -63,7 +63,7 @@ window.requestpolicy.requestLog = (function (self) {
     showLogIsEmptyMessage();
 
     // Give the requestpolicy overlay direct access to the the request log.
-    window.parent.requestpolicy.overlay.requestLog = self;
+    window.parent.rpcontinued.overlay.requestLog = self;
   }
   function showLogIsEmptyMessage() {
     var message = StringUtils.$str("requestLogIsEmpty");
@@ -78,4 +78,4 @@ window.requestpolicy.requestLog = (function (self) {
 
 
   return self;
-}(window.requestpolicy.requestLog || {}));
+}(window.rpcontinued.requestLog || {}));
diff --git a/src/content/ui/request-log.tree-view.js b/src/content/ui/request-log.tree-view.js
index 8ccb5ba..bcc3195 100644
--- a/src/content/ui/request-log.tree-view.js
+++ b/src/content/ui/request-log.tree-view.js
@@ -21,9 +21,9 @@
  * ***** END LICENSE BLOCK *****
  */
 
-window.requestpolicy = window.requestpolicy || {};
+window.rpcontinued = window.rpcontinued || {};
 
-window.requestpolicy.requestLog = (function (self) {
+window.rpcontinued.requestLog = (function (self) {
 
   const Ci = Components.interfaces;
   const Cc = Components.classes;
@@ -182,4 +182,4 @@ window.requestpolicy.requestLog = (function (self) {
   };
 
   return self;
-}(window.requestpolicy.requestLog || {}));
+}(window.rpcontinued.requestLog || {}));
diff --git a/src/content/ui/request-log.xul b/src/content/ui/request-log.xul
index 20c6758..e6a1da9 100644
--- a/src/content/ui/request-log.xul
+++ b/src/content/ui/request-log.xul
@@ -38,19 +38,19 @@
       <menuitem
         id="rpcontinuedRequestLogCopyOrigin"
         label="&rp.requestLog.copyOriginToClipboard;"
-        oncommand="requestpolicy.requestLog.copyToClipboard('rpcontinued-requestLog-origin');" />
+        oncommand="rpcontinued.requestLog.copyToClipboard('rpcontinued-requestLog-origin');" />
       <menuitem
         id="rpcontinuedRequestLogOpenOriginNewTab"
         label="&rp.requestLog.openOriginInNewTab;"
-        oncommand="requestpolicy.requestLog.openInNewTab('rpcontinued-requestLog-origin');" />
+        oncommand="rpcontinued.requestLog.openInNewTab('rpcontinued-requestLog-origin');" />
       <menuitem
         id="rpcontinuedRequestLogCopyDestination"
         label="&rp.requestLog.copyDestinationToClipboard;"
-        oncommand="requestpolicy.requestLog.copyToClipboard('rpcontinued-requestLog-destination');" />
+        oncommand="rpcontinued.requestLog.copyToClipboard('rpcontinued-requestLog-destination');" />
       <menuitem
         id="rpcontinuedRequestLogDestinationOriginNewTab"
         label="&rp.requestLog.openDestinationInNewTab;"
-        oncommand="requestpolicy.requestLog.openInNewTab('rpcontinued-requestLog-destination');" />
+        oncommand="rpcontinued.requestLog.openInNewTab('rpcontinued-requestLog-destination');" />
     </menupopup>
   </popupset>
 
@@ -81,9 +81,9 @@
            control="rpcontinued-requestLog-requestFilter"
            value="&rp.requestLog.filterRequests;"/>
     <textbox id="rpcontinued-requestLog-requestFilter"
-             oninput="requestpolicy.requestLog.filterChanged(event)" flex="1"/>
+             oninput="rpcontinued.requestLog.filterChanged(event)" flex="1"/>
     <button id="rpcontinued-requestLog-clearFilter"
-            oncommand="requestpolicy.requestLog.clearFilter()"
+            oncommand="rpcontinued.requestLog.clearFilter()"
             label="&rp.requestLog.clearFilter;"
             accesskey="&rp.requestLog.clearFilter.accesskey;" disabled="true"/>
   </hbox>
diff --git a/src/content/ui/xul-trees.js b/src/content/ui/xul-trees.js
index a8c2c81..ce51b85 100644
--- a/src/content/ui/xul-trees.js
+++ b/src/content/ui/xul-trees.js
@@ -42,11 +42,11 @@ exports.mainTree = [
     {tag: "menupopup",
     children: [
       {tag: "menuitem", label: "&rp.menu.managePolicies;", accesskey: "m",
-          oncommand: "requestpolicy.overlay.openPolicyManager();"},
+          oncommand: "rpcontinued.overlay.openPolicyManager();"},
       {tag: "menuitem", label: "&rp.requestLog.title;", accesskey: "l",
-          oncommand: "requestpolicy.overlay.toggleRequestLog(event);"},
+          oncommand: "rpcontinued.overlay.toggleRequestLog(event);"},
       {tag: "menuitem", label: "&rp.menu.preferences;", accesskey: "p",
-          oncommand: "requestpolicy.overlay.openPrefs(event);"}
+          oncommand: "rpcontinued.overlay.openPrefs(event);"}
     ]}
   ]},
 
@@ -55,7 +55,7 @@ exports.mainTree = [
       tag: "keyset", id: "rpcontinuedKeyset",
   children: [
     {tag: "key", key: "r", modifiers: "accel alt",
-        oncommand: "requestpolicy.overlay.openMenuByHotkey()"}
+        oncommand: "rpcontinued.overlay.openMenuByHotkey()"}
   ]},
 
 
@@ -65,8 +65,8 @@ exports.mainTree = [
     {tag: "menupopup", id: "rpcontinuedRedirectAddRuleMenu"},
     {tag: "menupopup", id: "rpc-popup", noautohide: "true",
         position: "after_start",
-        onpopupshowing: "requestpolicy.overlay.onPopupShowing(event);",
-        onpopuphidden: "requestpolicy.overlay.onPopupHidden(event);",
+        onpopupshowing: "rpcontinued.overlay.onPopupShowing(event);",
+        onpopuphidden: "rpcontinued.overlay.onPopupHidden(event);",
     children: [
       {tag: "vbox", id: "rpc-contents",
       children: [
@@ -75,7 +75,7 @@ exports.mainTree = [
           {tag: "vbox", id: "rpc-origins-destinations",
           children: [
             {tag: "hbox", id: "rpc-origin", "class": "rpc-od-item",
-                onclick: "requestpolicy.menu.itemSelected(event);",
+                onclick: "rpcontinued.menu.itemSelected(event);",
             children: [
               {tag: "label", id: "rpc-origin-domainname", "class": "domainname",
                   flex: "2"},
@@ -121,7 +121,7 @@ exports.mainTree = [
         {tag: "hbox", id: "rpc-revoke-temporary-permissions", hidden: "true",
         children: [
           {tag: "label", value: "&rp.menu.revokeTemporaryPermissions;",
-              onclick: "requestpolicy.overlay.revokeTemporaryPermissions();"}
+              onclick: "rpcontinued.overlay.revokeTemporaryPermissions();"}
         ]},
         {tag: "hbox", id: "rpc-footer",
         children: [
@@ -129,22 +129,22 @@ exports.mainTree = [
           children: [
             {tag: "label", id: "rpc-link-enable-blocking",
                 "class": "rpc-footer-link", value: "&rp.menu.enableBlocking;",
-                onclick: "requestpolicy.overlay.toggleTemporarilyAllowAll();"},
+                onclick: "rpcontinued.overlay.toggleTemporarilyAllowAll();"},
             {tag: "label", id: "rpc-link-disable-blocking",
                 "class": "rpc-footer-link", value: "&rp.menu.disableBlocking;",
-                onclick: "requestpolicy.overlay.toggleTemporarilyAllowAll();"},
+                onclick: "rpcontinued.overlay.toggleTemporarilyAllowAll();"},
             {tag: "label", id: "rpc-link-help", "class": "rpc-footer-link",
                 value: "&rp.menu.help;",
-                onclick: "requestpolicy.overlay.openHelp();"},
+                onclick: "rpcontinued.overlay.openHelp();"},
             {tag: "label", id: "rpc-link-prefs", "class": "rpc-footer-link",
                 value: "&rp.menu.preferences;",
-                onclick: "requestpolicy.overlay.openPrefs(event);"},
+                onclick: "rpcontinued.overlay.openPrefs(event);"},
             {tag: "label", id: "rpc-link-policies", "class": "rpc-footer-link",
                 value: "&rp.menu.managePolicies;",
-                onclick: "requestpolicy.overlay.openPolicyManager();"},
+                onclick: "rpcontinued.overlay.openPolicyManager();"},
             {tag: "label", id: "rpc-link-request-log",
                 "class": "rpc-footer-link", value: "&rp.requestLog.title;",
-                onclick: "requestpolicy.overlay.toggleRequestLog(event);"}
+                onclick: "rpcontinued.overlay.toggleRequestLog(event);"}
           ]}
         ]}
       ]}
@@ -169,11 +169,11 @@ exports.mainTree = [
             value: "&rp.requestLog.title;", crop: "end"},
         {tag: "button", id: "rpcontinued-requestLog-clear",
             label: "&rp.requestLog.clear;",
-            oncommand: "requestpolicy.overlay.clearRequestLog();"},
+            oncommand: "rpcontinued.overlay.clearRequestLog();"},
         {tag: "vbox", flex: "1"},
         {tag: "toolbarbutton", id: "rpcontinued-requestLog-close",
             align: "right",
-            oncommand: "requestpolicy.overlay.toggleRequestLog()"}
+            oncommand: "rpcontinued.overlay.toggleRequestLog()"}
       ]}
     ]},
     // The src of this iframe is set to

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