mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-18 17:02:27 +02:00
Merge branch 'master' of github.com:gorhill/uBlock
This commit is contained in:
commit
64d476472d
@ -624,14 +624,14 @@
|
||||
return;
|
||||
}
|
||||
e.stopPropagation && e.stopPropagation();
|
||||
switch(e.message.type) {
|
||||
case "main_frame":
|
||||
if(e.message.type === "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
|
||||
}
|
||||
switch(e.message.type) {
|
||||
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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user