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

lib/appSupport.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 844 matching lines @@
       {
         try
         {
           host = location.host.replace(/^www\./, "");
         } catch (e) {}
       }
 
       if (!host)
         return;
 
-      if (Policy.isWhitelisted(location.spec))
+      if (Policy.isWindowWhitelisted(exports.getBrowser(window).contentWindow))

[Wladimir Palant, 2014/08/14 19:58:15]

Please revert the changes to this file. Sitekeys should whitelist individual
requests but not whitelist entire windows - that's the whole point of this
change. Communicating sitekeys via whitelisting UI that is all about locations
is hard to say the least, so we don't.

[Thomas Greiner, 2014/08/29 15:57:29]

Done.

         UI.removeWhitelist(window);
       else
         UI.toggleFilter(Filter.fromText("@@||" + host + "^$document"));
     };
 
     let menuItem = null;
     onShutdown.add(function()
     {
       let window = null;
       for (window in UI.applicationWindows)
@@ skipping 19 matching lines @@
         if (location instanceof Ci.nsIURL && Policy.isBlockableScheme(location))
         {
           try
           {
             host = location.host.replace(/^www\./, "");
           } catch (e) {}
         }
         if (!host)
           return;
 
-        if (host && Policy.isWhitelisted(location.spec))
+        if (host && Policy.isWindowWhitelisted(exports.getBrowser(window).contentWindow))
           action = "enable_site";
         else if (host)
           action = "disable_site";
       }
       else
         action = "enable";
 
       let actionText = Utils.getString("mobile_menu_" + action);
       if (host)
         actionText = actionText.replace(/\?1\?/g, host);
@@ skipping 31 matching lines @@
             event.state = {id: require("info").addonID};
             browser._contentWindow.dispatchEvent(event);
           });
         });
       }, true);
     };
 
     break;
   }
 }