Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-15 07:22:28 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
gorhill 2015-03-23 15:19:22 -04:00
commit 032a63f295
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() {
safari.application.addEventListener('beforeNavigate', function(e) {
if(!vAPI.tabs.popupCandidate || !e.target || e.url === 'about:blank') {
safari.application.addEventListener("beforeNavigate", function(e) {
if(!vAPI.tabs.popupCandidate || !e.target || e.url === "about:blank") {
return;
}
var url = e.url,
@ -259,7 +259,6 @@
targetTabId: tabId,
openerTabId: vAPI.tabs.popupCandidate
};
vAPI.tabs.popupCandidate = false;
if(vAPI.tabs.onPopup(details)) {
e.preventDefault();
if(vAPI.tabs.stack[details.openerTabId]) {
@ -702,9 +701,9 @@
}
switch(e.message.type) {
case "popup":
if(e.message.url === 'about:blank') {
vAPI.tabs.popupCandidate = vAPI.tabs.getTabId(e.target);
e.message = true;
vAPI.tabs.popupCandidate = vAPI.tabs.getTabId(e.target);
if(e.message.url === "about:blank") {
e.message = false;
return;
}
else {