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

Doh

This commit is contained in:
Chris 2015-01-20 00:44:04 -07:00
parent 03668551c2
commit 4901b11fae
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,23 +189,20 @@ vAPI.tabs = {
vAPI.tabs.registerListeners = function() {
safari.application.addEventListener('beforeNavigate', function(e) {
if ( !e.target || e.url === 'about:blank' ) {
if ( !vAPI.tabs.popupCandidate || !e.target || e.url === 'about:blank' ) {
return;
}
var url = e.url, tabId = vAPI.tabs.getTabId(e.target);
if ( vAPI.tabs.popupCandidate ) {
var details = {
url: url,
tabId: tabId,
sourceTabId: vAPI.tabs.popupCandidate
};
vAPI.tabs.popupCandidate = false;
if ( vAPI.tabs.onPopup(details) ) {
e.preventDefault();
if ( vAPI.tabs.stack[details.sourceTabId] ) {
vAPI.tabs.stack[details.sourceTabId].activate();
}
return;
var details = {
url: url,
tabId: tabId,
sourceTabId: vAPI.tabs.popupCandidate
};
vAPI.tabs.popupCandidate = false;
if ( vAPI.tabs.onPopup(details) ) {
e.preventDefault();
if ( vAPI.tabs.stack[details.sourceTabId] ) {
vAPI.tabs.stack[details.sourceTabId].activate();
}
}
}, true);