Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-07 03:12:33 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:gorhill/uBlock

Browse Source
This commit is contained in:
gorhill 2015-02-25 14:15:50 -05:00
commit 64d476472d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
platform/safari/vapi-background.js
View File

@ -624,14 +624,14 @@
return; return;
} }
e.stopPropagation && e.stopPropagation(); e.stopPropagation && e.stopPropagation();
if(e.message.type === "main_frame") {
vAPI.tabs.onNavigation({
url: e.message.url,
frameId: 0,
tabId: vAPI.tabs.getTabId(e.target)
});
}
switch(e.message.type) { switch(e.message.type) {
case "main_frame":
vAPI.tabs.onNavigation({
url: e.message.url,
frameId: 0,
tabId: vAPI.tabs.getTabId(e.target)
});
// Don't break here; let main_frame go through
case "popup": case "popup":
if(e.message.url === 'about:blank') { if(e.message.url === 'about:blank') {
vAPI.tabs.popupCandidate = vAPI.tabs.getTabId(e.target); vAPI.tabs.popupCandidate = vAPI.tabs.getTabId(e.target);
@ -660,7 +660,8 @@
if(blockVerdict && blockVerdict.cancel) { if(blockVerdict && blockVerdict.cancel) {
e.message = false; e.message = false;
return; return;
} else { }
else {
e.message = true; e.message = true;
return; return;
} }