Issue 431/432 - Remove special handling for the $sitekey option

lib/ui.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 1070 matching lines @@
    * Updates Adblock Plus icon state for a single application window.
    */
   updateIconState: function(/**Window*/ window, /**Element*/ icon)
   {
     if (!icon)
       return;
 
     let state = (Prefs.enabled ? "active" : "disabled");
     if (state == "active")
     {
-      let location = this.getCurrentLocation(window);
-      if (location && Policy.isWhitelisted(location.spec))
+      let {getBrowser} = require("appSupport");
+      if (Policy.isWindowWhitelisted(getBrowser(window).contentWindow))
         state = "whitelisted";
     }
 
     let popupId = "abp-status-popup";
     if (icon.localName == "statusbarpanel")
     {
       if (Prefs.defaultstatusbaraction == 0)
       {
         icon.setAttribute("popup", popupId);
         icon.removeAttribute("context");
@@ skipping 220 matching lines @@
       if (!this.removeWhitelist(window))
         this.togglePref("enabled");
     }
   },
 
   /**
    * Removes/disables the exception rule applying for the current page.
    */
   removeWhitelist: function(/**Window*/ window)
   {
-    let location = this.getCurrentLocation(window);
     let filter = null;
-    if (location)
-      filter = Policy.isWhitelisted(location.spec);
+    let {getBrowser} = require("appSupport");
+    filter = Policy.isWindowWhitelisted(getBrowser(window).contentWindow);
     if (filter && filter.subscriptions.length && !filter.disabled)
     {
       UI.toggleFilter(filter);
       return true;
     }
     return false;
   },
 
   /**
    * Updates state of the icon tooltip.
@@ skipping 328 matching lines @@
               break;
             }
           }
         }
 
         node = node.parentNode;
       }
     }
 
     // Add "Remove exception" menu item if necessary
-    let location = this.getCurrentLocation(window);
-    let filter = (location ? Policy.isWhitelisted(location.spec) : null);
+    let {getBrowser} = require("appSupport");
+    let filter = Policy.isWindowWhitelisted(getBrowser(window).contentWindow);
     if (filter && filter.subscriptions.length && !filter.disabled)
     {
       let label = this.overlay.attributes.whitelistcontextlabel;
       if (!label)
         return;
 
       let item = popup.ownerDocument.createElement("menuitem");
       item.setAttribute("label", label);
       item.setAttribute("class", "abp-contextmenuitem");
       item.addEventListener("command", this.toggleFilter.bind(this, filter), false);
@@ skipping 253 matching lines @@
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });