Issue 433 - Made adjustments for $sitekey-related changes to the Matcher API

include.preload.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 40 matching lines @@
           if (tag == "frame")
             element.style.setProperty("visibility", "hidden", "important");
           else
             element.style.setProperty("display", "none", "important");
         }
       }
     );
   }
 }
 
-function checkExceptionKey()
+function checkSitekey()
 {
   var attr = document.documentElement.getAttribute("data-adblockkey");
   if (attr)
-    ext.backgroundPage.sendMessage({type: "add-key-exception", token: attr});
+    ext.backgroundPage.sendMessage({type: "add-sitekey", sitekey: attr});

[Wladimir Palant, 2014/09/10 18:27:04]

IMHO, the parameter name "token" is better left as is - this isn't the sitekey
you are sending, it's the combination of sitekey and signature.

[Thomas Greiner, 2014/09/15 09:24:59]

Done.

 }
 
 function hasInlineURL(element, attribute)
 {
   var value = element.getAttribute(attribute);
   return value == null || /^\s*(javascript:|about:|$)/i.test(value);
 }
 
 function isInlineFrame(element)
 {
@@ skipping 120 matching lines @@
       for (var tagName in typeMap)
         Array.prototype.forEach.call(element.contentDocument.getElementsByTagName(tagName), checkCollapse);
     }
   }, true);
 
   ext.backgroundPage.sendMessage({type: "get-selectors"}, setElemhideCSSRules);
 }
 
 if (document instanceof HTMLDocument)
 {
-  checkExceptionKey();
+  checkSitekey();
   init(document);
 }