Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Safari: fix main_frame handling

This commit is contained in:
Chris 2015-02-25 11:37:33 -07:00
parent d80446bd96
commit d64a340d2e
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;
}
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) {
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":
if(e.message.url === 'about:blank') {
vAPI.tabs.popupCandidate = vAPI.tabs.getTabId(e.target);
@ -660,7 +660,8 @@
if(blockVerdict && blockVerdict.cancel) {
e.message = false;
return;
} else {
}
else {
e.message = true;
return;
}