[Pkg-mozext-commits] [requestpolicy] 125/280: [refact] `document.getElementById` --> `$id`

David Prévot taffit at moszumanska.debian.org
Sat May 2 20:30:10 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 f3c534103815f4c6dc083fd09f6a1fc6d704f374
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Jan 6 16:58:28 2015 +0100

    [refact] `document.getElementById` --> `$id`
---
 src/content/settings/advancedprefs.js | 56 +++++++++++++++++------------------
 src/content/settings/basicprefs.js    | 20 ++++++-------
 src/content/settings/common.js        |  3 ++
 src/content/settings/defaultpolicy.js | 18 +++++------
 src/content/settings/oldrules.js      |  4 +--
 src/content/settings/yourpolicy.js    |  8 ++---
 src/content/ui/menu.js                | 53 ++++++++++++++++-----------------
 src/content/ui/overlay.js             | 42 ++++++++++++--------------
 8 files changed, 101 insertions(+), 103 deletions(-)

diff --git a/src/content/settings/advancedprefs.js b/src/content/settings/advancedprefs.js
index b426b10..5bb4a00 100644
--- a/src/content/settings/advancedprefs.js
+++ b/src/content/settings/advancedprefs.js
@@ -29,44 +29,44 @@ var prefsChangedObserver = null;
 
 function updateDisplay() {
   // Link prefetch.
-  document.getElementById('pref-linkPrefetch').checked =
+  $id('pref-linkPrefetch').checked =
       rootPrefBranch.getBoolPref('network.prefetch-next');
 
-  document.getElementById('pref-prefetch.link.disableOnStartup').checked =
+  $id('pref-prefetch.link.disableOnStartup').checked =
       rpPrefBranch.getBoolPref('prefetch.link.disableOnStartup');
 
-  document.getElementById('pref-prefetch.link.restoreDefaultOnUninstall').checked =
+  $id('pref-prefetch.link.restoreDefaultOnUninstall').checked =
       rpPrefBranch.getBoolPref('prefetch.link.restoreDefaultOnUninstall');
 
   // DNS prefetch.
-  document.getElementById('pref-dnsPrefetch').checked =
+  $id('pref-dnsPrefetch').checked =
       !rootPrefBranch.getBoolPref('network.dns.disablePrefetch');
 
-  document.getElementById('pref-prefetch.dns.disableOnStartup').checked =
+  $id('pref-prefetch.dns.disableOnStartup').checked =
       rpPrefBranch.getBoolPref('prefetch.dns.disableOnStartup');
 
-  document.getElementById('pref-prefetch.dns.restoreDefaultOnUninstall').checked =
+  $id('pref-prefetch.dns.restoreDefaultOnUninstall').checked =
       rpPrefBranch.getBoolPref('prefetch.dns.restoreDefaultOnUninstall');
 
   // TODO: Create a class which acts as an API for preferences and which ensures
   // that the returned value is always a valid value for "string" preferences.
   var sorting = rpPrefBranch.getCharPref('menu.sorting');
 
-  if (sorting == document.getElementById('sortByNumRequests').value) {
-    document.getElementById('sortByNumRequests').checked = true;
-    document.getElementById('sortByDestName').checked = false;
-    document.getElementById('noSorting').checked = false;
-  } else if (sorting == document.getElementById('noSorting').value) {
-    document.getElementById('sortByNumRequests').checked = false;
-    document.getElementById('sortByDestName').checked = false;
-    document.getElementById('noSorting').checked = true;
+  if (sorting == $id('sortByNumRequests').value) {
+    $id('sortByNumRequests').checked = true;
+    $id('sortByDestName').checked = false;
+    $id('noSorting').checked = false;
+  } else if (sorting == $id('noSorting').value) {
+    $id('sortByNumRequests').checked = false;
+    $id('sortByDestName').checked = false;
+    $id('noSorting').checked = true;
   } else {
-    document.getElementById('sortByNumRequests').checked = false;
-    document.getElementById('sortByDestName').checked = true;
-    document.getElementById('noSorting').checked = false;
+    $id('sortByNumRequests').checked = false;
+    $id('sortByDestName').checked = true;
+    $id('noSorting').checked = false;
   }
 
-  document.getElementById('menu.info.showNumRequests').checked =
+  $id('menu.info.showNumRequests').checked =
       rpPrefBranch.getBoolPref('menu.info.showNumRequests');
 }
 
@@ -75,14 +75,14 @@ function onload() {
   updateDisplay();
 
   // Link prefetch.
-  document.getElementById('pref-linkPrefetch').addEventListener('change',
+  $id('pref-linkPrefetch').addEventListener('change',
       function (event) {
         rootPrefBranch.setBoolPref('network.prefetch-next', event.target.checked);
         Services.prefs.savePrefFile(null);
       }
   );
 
-  document.getElementById('pref-prefetch.link.disableOnStartup').addEventListener('change',
+  $id('pref-prefetch.link.disableOnStartup').addEventListener('change',
       function (event) {
         rpPrefBranch.setBoolPref('prefetch.link.disableOnStartup',
             event.target.checked);
@@ -90,7 +90,7 @@ function onload() {
       }
   );
 
-  document.getElementById('pref-prefetch.link.restoreDefaultOnUninstall').addEventListener('change',
+  $id('pref-prefetch.link.restoreDefaultOnUninstall').addEventListener('change',
       function (event) {
         rpPrefBranch.setBoolPref('prefetch.link.restoreDefaultOnUninstall', event.target.checked);
         Services.prefs.savePrefFile(null);
@@ -98,21 +98,21 @@ function onload() {
   );
 
   // DNS prefetch.
-  document.getElementById('pref-dnsPrefetch').addEventListener('change',
+  $id('pref-dnsPrefetch').addEventListener('change',
       function (event) {
         rootPrefBranch.setBoolPref('network.dns.disablePrefetch', !event.target.checked);
         Services.prefs.savePrefFile(null);
       }
   );
 
-  document.getElementById('pref-prefetch.dns.disableOnStartup').addEventListener('change',
+  $id('pref-prefetch.dns.disableOnStartup').addEventListener('change',
       function (event) {
         rpPrefBranch.setBoolPref('prefetch.dns.disableOnStartup', event.target.checked);
         Services.prefs.savePrefFile(null);
       }
   );
 
-  document.getElementById('pref-prefetch.dns.restoreDefaultOnUninstall').addEventListener('change',
+  $id('pref-prefetch.dns.restoreDefaultOnUninstall').addEventListener('change',
       function (event) {
         rpPrefBranch.setBoolPref('prefetch.dns.restoreDefaultOnUninstall', event.target.checked);
         Services.prefs.savePrefFile(null);
@@ -123,11 +123,11 @@ function onload() {
     rpPrefBranch.setCharPref('menu.sorting', event.target.value);
     Services.prefs.savePrefFile(null);
   };
-  document.getElementById('sortByNumRequests').addEventListener('change', sortingListener);
-  document.getElementById('sortByDestName').addEventListener('change', sortingListener);
-  document.getElementById('noSorting').addEventListener('change', sortingListener);
+  $id('sortByNumRequests').addEventListener('change', sortingListener);
+  $id('sortByDestName').addEventListener('change', sortingListener);
+  $id('noSorting').addEventListener('change', sortingListener);
 
-  document.getElementById('menu.info.showNumRequests').addEventListener('change',
+  $id('menu.info.showNumRequests').addEventListener('change',
       function (event) {
         rpPrefBranch.setBoolPref('menu.info.showNumRequests', event.target.checked);
         Services.prefs.savePrefFile(null);
diff --git a/src/content/settings/basicprefs.js b/src/content/settings/basicprefs.js
index b89e195..34a4674 100644
--- a/src/content/settings/basicprefs.js
+++ b/src/content/settings/basicprefs.js
@@ -20,16 +20,16 @@ var prefsChangedObserver = null;
 
 function updateDisplay() {
   var indicate = rpPrefBranch.getBoolPref('indicateBlockedObjects');
-  document.getElementById('pref-indicateBlockedObjects').checked = indicate;
-  document.getElementById('indicateBlockedImages-details').hidden = !indicate;
+  $id('pref-indicateBlockedObjects').checked = indicate;
+  $id('indicateBlockedImages-details').hidden = !indicate;
 
-  document.getElementById('pref-dontIndicateBlacklistedObjects').checked =
+  $id('pref-dontIndicateBlacklistedObjects').checked =
       !rpPrefBranch.getBoolPref('indicateBlacklistedObjects');
 
-  document.getElementById('pref-autoReload').checked =
+  $id('pref-autoReload').checked =
       rpPrefBranch.getBoolPref('autoReload');
 
-  document.getElementById('pref-privateBrowsingPermanentWhitelisting').checked =
+  $id('pref-privateBrowsingPermanentWhitelisting').checked =
       rpPrefBranch.getBoolPref('privateBrowsingPermanentWhitelisting');
 
 //  if (rpPrefBranch.getBoolPref('defaultPolicy.allow')) {
@@ -37,14 +37,14 @@ function updateDisplay() {
 //  } else {
 //    var word = 'block';
 //  }
-//  document.getElementById('defaultpolicyword').innerHTML = word;
+//  $id('defaultpolicyword').innerHTML = word;
 }
 
 
 function onload() {
   updateDisplay();
 
-  document.getElementById('pref-indicateBlockedObjects').addEventListener('change',
+  $id('pref-indicateBlockedObjects').addEventListener('change',
       function (event) {
         rpPrefBranch.setBoolPref('indicateBlockedObjects', event.target.checked);
         Services.prefs.savePrefFile(null);
@@ -52,7 +52,7 @@ function onload() {
       }
   );
 
-  document.getElementById('pref-dontIndicateBlacklistedObjects').addEventListener('change',
+  $id('pref-dontIndicateBlacklistedObjects').addEventListener('change',
       function (event) {
         Prefs.prefs.setBoolPref('indicateBlacklistedObjects', !event.target.checked);
         Services.prefs.savePrefFile(null);
@@ -60,7 +60,7 @@ function onload() {
       }
   );
 
-  document.getElementById('pref-autoReload').addEventListener('change',
+  $id('pref-autoReload').addEventListener('change',
     function(event) {
       rpPrefBranch.setBoolPref('autoReload', event.target.checked);
       Services.prefs.savePrefFile(null);
@@ -68,7 +68,7 @@ function onload() {
     }
   );
 
-  document.getElementById('pref-privateBrowsingPermanentWhitelisting')
+  $id('pref-privateBrowsingPermanentWhitelisting')
       .addEventListener('change', function (event) {
         rpPrefBranch.setBoolPref('privateBrowsingPermanentWhitelisting',
                                  event.target.checked);
diff --git a/src/content/settings/common.js b/src/content/settings/common.js
index 787a2e8..01bea1c 100644
--- a/src/content/settings/common.js
+++ b/src/content/settings/common.js
@@ -23,6 +23,9 @@ var WinEnv = new Environment();
 WinEnv.shutdownOnWindowUnload(content);
 
 
+var $id = content.document.getElementById.bind(content.document);
+
+
 const COMMON_STRINGS = [
   'preferences',
   'managePolicies',
diff --git a/src/content/settings/defaultpolicy.js b/src/content/settings/defaultpolicy.js
index a89b64b..14eab62 100644
--- a/src/content/settings/defaultpolicy.js
+++ b/src/content/settings/defaultpolicy.js
@@ -23,25 +23,25 @@ var prefsChangedObserver = null;
 function updateDisplay() {
   var defaultallow = rpPrefBranch.getBoolPref('defaultPolicy.allow');
   if (defaultallow) {
-    document.getElementById('defaultallow').checked = true;
-    document.getElementById('defaultdenysetting').hidden = true;
+    $id('defaultallow').checked = true;
+    $id('defaultdenysetting').hidden = true;
   } else {
-    document.getElementById('defaultdeny').checked = true;
-    document.getElementById('defaultdenysetting').hidden = false;
+    $id('defaultdeny').checked = true;
+    $id('defaultdenysetting').hidden = false;
   }
 
   var allowsamedomain = rpPrefBranch.getBoolPref('defaultPolicy.allowSameDomain');
-  document.getElementById('allowsamedomain').checked = allowsamedomain;
+  $id('allowsamedomain').checked = allowsamedomain;
 }
 
 function showManageSubscriptionsLink() {
-  document.getElementById('subscriptionschanged').style.display = 'block';
+  $id('subscriptionschanged').style.display = 'block';
 }
 
 function onload() {
   updateDisplay();
 
-  document.getElementById('defaultallow').addEventListener('change',
+  $id('defaultallow').addEventListener('change',
       function (event) {
         var allow = event.target.checked;
         rpPrefBranch.setBoolPref('defaultPolicy.allow', allow);
@@ -53,7 +53,7 @@ function onload() {
         showManageSubscriptionsLink();
       }
   );
-  document.getElementById('defaultdeny').addEventListener('change',
+  $id('defaultdeny').addEventListener('change',
       function (event) {
         var deny = event.target.checked;
         rpPrefBranch.setBoolPref('defaultPolicy.allow', !deny);
@@ -65,7 +65,7 @@ function onload() {
         showManageSubscriptionsLink();
       }
   );
-  document.getElementById('allowsamedomain').addEventListener('change',
+  $id('allowsamedomain').addEventListener('change',
       function (event) {
         var allowSameDomain = event.target.checked;
         rpPrefBranch.setBoolPref('defaultPolicy.allowSameDomain',
diff --git a/src/content/settings/oldrules.js b/src/content/settings/oldrules.js
index 653dd42..6b794f8 100644
--- a/src/content/settings/oldrules.js
+++ b/src/content/settings/oldrules.js
@@ -18,7 +18,7 @@ var addHostWildcard = true;
 
 
 function clearRulesTable() {
-  var table = document.getElementById('rules');
+  var table = $id('rules');
   var children = table.getElementsByTagName('tr');
   while (children.length) {
     var child = children.item(0);
@@ -27,7 +27,7 @@ function clearRulesTable() {
 }
 
 function populateRuleTable() {
-  var table = document.getElementById('rules');
+  var table = $id('rules');
   // Setting the global rules var here.
   rules = common.getOldRulesAsNewRules(addHostWildcard);
 
diff --git a/src/content/settings/yourpolicy.js b/src/content/settings/yourpolicy.js
index 108e84e..8d3c4bf 100644
--- a/src/content/settings/yourpolicy.js
+++ b/src/content/settings/yourpolicy.js
@@ -35,7 +35,7 @@ var searchTimeoutId = null;
 function populateRuleTable(filter) {
   searchTimeoutId = null;
 
-  var table = document.getElementById('rules');
+  var table = $id('rules');
 
   clearRulesTable(table);
 
@@ -151,7 +151,7 @@ function addRule() {
     alert('Unable to add rule: ' + e.toString());
     return;
   }
-  var search = document.getElementById('rulesearch');
+  var search = $id('rulesearch');
 
   // the table is repopulated through the RulesChangedObserver
 }
@@ -215,7 +215,7 @@ function addRuleHelper() {
 
 
 function onload() {
-  var search = document.getElementById('rulesearch');
+  var search = $id('rulesearch');
   search.addEventListener('keyup', function (event) {
     if (searchTimeoutId != null) {
       clearTimeout(searchTimeoutId);
@@ -232,7 +232,7 @@ function onload() {
   // observe rule changes and update the table then
   WinEnv.obMan.observe({
     "requestpolicy-rules-changed": function(subject, topic, data) {
-      var search = document.getElementById('rulesearch');
+      var search = $id('rulesearch');
       populateRuleTable(search.value);
     }
   });
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index c323630..48ba541 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -51,6 +51,9 @@ requestpolicy.menu = (function() {
   let {C} = iMod("lib/utils/constants");
 
 
+  let $id = document.getElementById.bind(document);
+
+
   let initialized = false;
 
 
@@ -79,18 +82,15 @@ requestpolicy.menu = (function() {
       initialized = true;
 
       self._originItem = document.getElementById("rp-origin");
-      self._originDomainnameItem = document.getElementById('rp-origin-domainname');
-      self._originNumRequestsItem = document.getElementById('rp-origin-num-requests');
-
-      self._otherOriginsList = document.getElementById("rp-other-origins-list");
-      self._blockedDestinationsList = document
-            .getElementById("rp-blocked-destinations-list");
-      self._mixedDestinationsList = document
-            .getElementById("rp-mixed-destinations-list");
-      self._allowedDestinationsList = document
-            .getElementById("rp-allowed-destinations-list");
-      self._addRulesList = document.getElementById("rp-rules-add");
-      self._removeRulesList = document.getElementById("rp-rules-remove");
+      self._originDomainnameItem = $id('rp-origin-domainname');
+      self._originNumRequestsItem = $id('rp-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");
 
       var conflictCount = RequestProcessor.getConflictingExtensions().length;
       var hideConflictInfo = (conflictCount == 0);
@@ -110,10 +110,10 @@ requestpolicy.menu = (function() {
   self.prepareMenu = function() {
     try {
       var disabled = Prefs.isBlockingDisabled();
-      document.getElementById('rp-link-enable-blocking').hidden = !disabled;
-      document.getElementById('rp-link-disable-blocking').hidden = disabled;
+      $id('rp-link-enable-blocking').hidden = !disabled;
+      $id('rp-link-disable-blocking').hidden = disabled;
 
-      document.getElementById('rp-revoke-temporary-permissions').hidden =
+      $id('rp-revoke-temporary-permissions').hidden =
           !PolicyManager.temporaryRulesExist();
 
       self._currentUri = requestpolicy.overlay.getTopLevelDocumentUri();
@@ -170,7 +170,7 @@ requestpolicy.menu = (function() {
 
       self._populateOrigin();
       self._populateOtherOrigins();
-      self._activateOriginItem(self._originItem);
+      self._activateOriginItem($id("rp-origin"));
 
     } catch (e) {
       Logger.severe(Logger.TYPE_ERROR,
@@ -194,10 +194,10 @@ requestpolicy.menu = (function() {
         self._allowedDestinationsList,
         self._removeRulesList,
         self._addRulesList]);
-    document.getElementById('rp-other-origins').hidden = true;
-    document.getElementById('rp-blocked-destinations').hidden = true;
-    document.getElementById('rp-mixed-destinations').hidden = true;
-    document.getElementById('rp-allowed-destinations').hidden = true;
+    $id('rp-other-origins').hidden = true;
+    $id('rp-blocked-destinations').hidden = true;
+    $id('rp-mixed-destinations').hidden = true;
+    $id('rp-allowed-destinations').hidden = true;
     // TODO: show some message about why the menu is empty.
   };
 
@@ -273,7 +273,7 @@ requestpolicy.menu = (function() {
   self._populateOtherOrigins = function() {
     var guiOrigins = self._getOtherOriginsAsGUILocations();
     self._populateList(self._otherOriginsList, guiOrigins);
-    document.getElementById('rp-other-origins').hidden = guiOrigins.length == 0;
+    $id('rp-other-origins').hidden = guiOrigins.length == 0;
   };
 
   self._populateDestinations = function(originIdentifier) {
@@ -325,16 +325,15 @@ requestpolicy.menu = (function() {
 
     self._populateList(self._blockedDestinationsList,
         destsWithSolelyBlockedRequests);
-    document.getElementById('rp-blocked-destinations').hidden =
+    $id('rp-blocked-destinations').hidden =
         destsWithSolelyBlockedRequests.length == 0;
 
     self._populateList(self._mixedDestinationsList, destsMixed);
-    document.getElementById('rp-mixed-destinations').hidden =
-        destsMixed.length == 0;
+    $id('rp-mixed-destinations').hidden = destsMixed.length == 0;
 
     self._populateList(self._allowedDestinationsList,
         destsWithSolelyAllowedRequests);
-    document.getElementById('rp-allowed-destinations').hidden =
+    $id('rp-allowed-destinations').hidden =
         destsWithSolelyAllowedRequests.length == 0;
   };
 
@@ -472,8 +471,8 @@ requestpolicy.menu = (function() {
   };
 
   self._setPrivateBrowsingStyles = function() {
-    document.getElementById('rp-details').setAttribute(
-      'class', mayPermRulesBeDisplayed() === true ? '' : 'privatebrowsing');
+    let val = mayPermRulesBeDisplayed() === true ? '' : 'privatebrowsing';
+    $id('rp-details').setAttribute('class', val);
   };
 
   self._resetSelectedOrigin = function() {
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 211673b..5e8d7ef 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -51,9 +51,7 @@ requestpolicy.overlay = (function() {
   let {DOMUtils} = iMod("lib/utils/dom");
   let {C} = iMod("lib/utils/constants");
 
-  let $ = function(id) {
-    return document.getElementById(id);
-  }
+  let $id = document.getElementById.bind(document);
 
   //let _extensionConflictInfoUri = "http://www.requestpolicy.com/conflict?ext=";
 
@@ -108,12 +106,11 @@ requestpolicy.overlay = (function() {
 
         requestpolicy.menu.init();
 
-        popupElement = document.getElementById("rp-popup");
+        popupElement = $id("rp-popup");
 
-        //statusbar = document.getElementById("status-bar");
-        //rpContextMenu = document
-        //    .getElementById("requestpolicyContextMenu");
-        toolbox = document.getElementById("navigator-toolbox");
+        //statusbar = $id("status-bar");
+        //rpContextMenu = $id("requestpolicyContextMenu");
+        toolbox = $id("navigator-toolbox");
 
         var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
             .getService(Components.interfaces.nsIXULAppInfo);
@@ -152,7 +149,7 @@ requestpolicy.overlay = (function() {
     self._removeHistoryObserver();
     self._removeLocationObserver();
 
-    if ($("requestpolicy-requestLog").hidden === false) {
+    if ($id("requestpolicy-requestLog").hidden === false) {
       self.toggleRequestLog();
     }
   };
@@ -168,7 +165,7 @@ requestpolicy.overlay = (function() {
     //try {
       // Info on detecting page load at:
       // http://developer.mozilla.org/En/Code_snippets/On_page_load
-      var appcontent = document.getElementById("appcontent"); // browser
+      var appcontent = $id("appcontent"); // browser
       const requestpolicyOverlay = this;
       if (appcontent) {
         if (isFennec) {
@@ -289,7 +286,7 @@ requestpolicy.overlay = (function() {
 
       // Add an event listener for when the contentAreaContextMenu (generally
       // the right-click menu within the document) is shown.
-      var contextMenu = document.getElementById("contentAreaContextMenu");
+      var contextMenu = $id("contentAreaContextMenu");
       if (contextMenu) {
         contextMenu.addEventListener("popupshowing",
             self._contextMenuOnPopupShowing, false);
@@ -485,7 +482,7 @@ requestpolicy.overlay = (function() {
 
 
     var addRuleMenuName = "requestpolicyRedirectAddRuleMenu";
-    var addRulePopup = document.getElementById(addRuleMenuName);
+    var addRulePopup = $id(addRuleMenuName);
     DOMUtils.removeChildren(addRulePopup);
 
     let m = requestpolicy.menu;
@@ -609,7 +606,7 @@ requestpolicy.overlay = (function() {
    * Sets the blocked content notifications visible to the user.
    */
   self._setContentBlockedState = function(isContentBlocked) {
-    var button = document.getElementById(toolbarButtonId);
+    var button = $id(toolbarButtonId);
     if (button) {
       button.setAttribute("requestpolicyBlocked", isContentBlocked);
     }
@@ -635,7 +632,7 @@ requestpolicy.overlay = (function() {
    * Sets the permissive status visible to the user for just this window.
    */
   self._setPermissiveNotification = function(isPermissive) {
-    var button = document.getElementById(toolbarButtonId);
+    var button = $id(toolbarButtonId);
     if (button) {
       button.setAttribute("requestpolicyPermissive", isPermissive);
     }
@@ -1035,8 +1032,8 @@ requestpolicy.overlay = (function() {
     Prefs.setBlockingDisabled(disabled);
 
     // Change the link displayed in the menu.
-    document.getElementById('rp-link-enable-blocking').hidden = !disabled;
-    document.getElementById('rp-link-disable-blocking').hidden = disabled;
+    $id('rp-link-enable-blocking').hidden = !disabled;
+    $id('rp-link-disable-blocking').hidden = disabled;
 
     self._setPermissiveNotificationForAllWindows(disabled);
   };
@@ -1157,7 +1154,7 @@ requestpolicy.overlay = (function() {
     // directly specify the width of the entire popup.
     //Logger.dump('popup width: ' + popup.clientWidth);
     var popupWidth = popupElement.clientWidth ? 730 : popupElement.clientWidth;
-    var anchor = document.getElementById('content');
+    var anchor = $id('content');
     var contentWidth = anchor.clientWidth;
     // Take a few pixels off so it doesn't cover the browser chrome's border.
     var xOffset = contentWidth - popupWidth - 2;
@@ -1202,14 +1199,13 @@ requestpolicy.overlay = (function() {
   };
 
   self.toggleRequestLog = function() {
-    var requestLog = document.getElementById("requestpolicy-requestLog");
-    var requestLogSplitter = document.getElementById("requestpolicy-requestLog-splitter");
-    var requestLogFrame = document.getElementById("requestpolicy-requestLog-frame");
-    //var openRequestLog = document.getElementById("requestpolicyOpenRequestLog");
+    var requestLog = $id("requestpolicy-requestLog");
+    var requestLogSplitter = $id("requestpolicy-requestLog-splitter");
+    var requestLogFrame = $id("requestpolicy-requestLog-frame");
+    //var openRequestLog = $id("requestpolicyOpenRequestLog");
 
     // TODO: figure out how this should interact with the new menu.
-    //var closeRequestLog = document
-    //    .getElementById("requestpolicyCloseRequestLog");
+    //var closeRequestLog = $id("requestpolicyCloseRequestLog");
     var closeRequestLog = {};
 
     if (requestLog.hidden) {

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