Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-02 23:57:10 +02:00
Code Issues Releases Wiki Activity

Safari: better popup blocking

Browse Source
This commit is contained in:
Chris 2015-03-23 13:01:50 -05:00
parent 4a07482d46
commit 1699040649
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,8 +248,8 @@
/******************************************************************************/ /******************************************************************************/
vAPI.tabs.registerListeners = function() { vAPI.tabs.registerListeners = function() {
safari.application.addEventListener('beforeNavigate', function(e) { safari.application.addEventListener("beforeNavigate", function(e) {
if(!vAPI.tabs.popupCandidate || !e.target || e.url === 'about:blank') { if(!vAPI.tabs.popupCandidate || !e.target || e.url === "about:blank") {
return; return;
} }
var url = e.url, var url = e.url,
@ -259,7 +259,6 @@
targetTabId: tabId, targetTabId: tabId,
openerTabId: vAPI.tabs.popupCandidate openerTabId: vAPI.tabs.popupCandidate
}; };
vAPI.tabs.popupCandidate = false;
if(vAPI.tabs.onPopup(details)) { if(vAPI.tabs.onPopup(details)) {
e.preventDefault(); e.preventDefault();
if(vAPI.tabs.stack[details.openerTabId]) { if(vAPI.tabs.stack[details.openerTabId]) {
@ -702,9 +701,9 @@
} }
switch(e.message.type) { switch(e.message.type) {
case "popup": case "popup":
if(e.message.url === 'about:blank') { vAPI.tabs.popupCandidate = vAPI.tabs.getTabId(e.target);
vAPI.tabs.popupCandidate = vAPI.tabs.getTabId(e.target); if(e.message.url === "about:blank") {
e.message = true; e.message = false;
return; return;
} }
else { else {