Unified Diff: popupBlocker.js
Issue 6346177440120832:
Added abstraction for frames, to fix domain-based rules, whitelisting and ad counter on Safari (Closed)
Patch Set:
Created Dec. 21, 2013, 7:48 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/whitelisting.js ('K')
|
« popup.js ('k')
|
safari/ext/background.js » ('j')
|
safari/ext/background.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: popupBlocker.js |
| =================================================================== |
| --- a/popupBlocker.js |
| +++ b/popupBlocker.js |
| @@ -21,10 +21,13 @@ |
| chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details) |
| { |
| - if (isFrameWhitelisted(details.sourceTabId, details.sourceFrameId)) |
| + var sourceTab = new Tab({id: details.sourceTabId}); |
| + var sourceFrame = new Frame({id: details.sourceFrameId, tab: sourceTab}); |
| + |
| + if (isFrameWhitelisted(sourceTab, sourceFrame)) |
| return; |
| - var openerUrl = getFrameUrl(details.sourceTabId, details.sourceFrameId); |
| + var openerUrl = sourceFrame.url; |
| if (!openerUrl) |
| { |
| // We don't know the opener tab |
« lib/whitelisting.js ('K')
|
« popup.js ('k')
|
safari/ext/background.js » ('j')
|
safari/ext/background.js » ('J')
