Unified Diff: include.preload.js
Issue 6346177440120832:
Added abstraction for frames, to fix domain-based rules, whitelisting and ad counter on Safari (Closed)
Patch Set: Rebased and addressed comments
Created Jan. 19, 2014, 10:40 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« chrome/ext/background.js ('K')
|
« chrome/ext/content.js ('k')
|
lib/basedomain.js » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: include.preload.js |
| =================================================================== |
| --- a/include.preload.js |
| +++ b/include.preload.js |
| @@ -82,7 +82,6 @@ |
| { |
| type: "should-collapse", |
| url: url, |
| - documentUrl: document.URL, |
| mediatype: typeMap[tag] |
| }, |
| @@ -110,13 +109,11 @@ |
| document.addEventListener("error", checkCollapse, true); |
| document.addEventListener("load", checkCollapse, true); |
| - ext.backgroundPage.sendMessage( |
| - { |
| - type: "get-selectors", |
| - frameUrl: window.location.href |
| - }, |
| - setElemhideCSSRules |
| - ); |
| + var attr = document.documentElement.getAttribute("data-adblockkey"); |
| + if (attr) |
| + ext.backgroundPage.sendMessage({type: "add-key-exception", token: attr}); |
| + |
| + ext.backgroundPage.sendMessage({type: "get-selectors"}, setElemhideCSSRules); |
| } |
| // In Chrome 18 the document might not be initialized yet |
« chrome/ext/background.js ('K')
|
« chrome/ext/content.js ('k')
|
lib/basedomain.js » ('j')
|
no next file with comments »
