Fix popup blocking (gorhill#11)

Should now close filtered popups

Author: el1t

platform/safari/vapi-background.js

@@ -384,18 +384,14 @@
             if(!vAPI.tabs.popupCandidate || !e.target || e.url === "about:blank") {
                 return;
             }
-            var url = e.url,
-                tabId = vAPI.tabs.getTabId(e.target);
-            var details = {
-                targetURL: url,
-                targetTabId: tabId.toString(),
-                openerTabId: vAPI.tabs.popupCandidate
-            };
+            var targetUrl = e.url,
+                targetTabId = vAPI.tabs.getTabId(e.target).toString(),
+                openerTabId = vAPI.tabs.popupCandidate;
             vAPI.tabs.popupCandidate = false;
-            if(vAPI.tabs.onPopup(details)) {
+            if(vAPI.tabs.onPopupUpdated(targetTabId, openerTabId, targetUrl)) {
                 e.preventDefault();
-                if(vAPI.tabs.stack[details.openerTabId]) {
-                    vAPI.tabs.stack[details.openerTabId].activate();
+                if(vAPI.tabs.stack[openerTabId]) {
+                    vAPI.tabs.stack[openerTabId].activate();
                 }
             }
         }, true);
@@ -1067,24 +1063,18 @@
                 var blockVerdict = onHeadersReceivedClient(e.message);
                 if(blockVerdict && blockVerdict.responseHeaders) {
                     e.message = false;
-                }
-                else {
+                } else {
                     e.message = true;
                 }
                 return;
             }
             switch(e.message.type) {
                 case "popup":
                     var openerTabId = vAPI.tabs.getTabId(e.target).toString();
-                    var shouldBlock = !!vAPI.tabs.onPopup({
-                        targetURL: e.message.url,
-                        targetTabId: "preempt",
-                        openerTabId: openerTabId
-                    });
-                    if(shouldBlock) {
+                    var shouldBlock = !!vAPI.tabs.onPopupUpdated("preempt", openerTabId, e.message.url);
+                    if (shouldBlock) {
                         e.message = false;
-                    }
-                    else {
+                    } else {
                         vAPI.tabs.popupCandidate = openerTabId;
                         e.message = true;
                     }
@@ -1103,13 +1093,11 @@
                     if(blockVerdict && blockVerdict.cancel) {
                         e.message = false;
                         return;
-                    }
-                    else {
+                    } else {
                         e.message = true;
                         return;
                     }
             }
-            return;
         };
         safari.application.addEventListener("message", onBeforeRequestAdapter, true);
     };

src/js/tab.js

@@ -698,18 +698,22 @@ vAPI.tabs.onPopupUpdated = (function() {
         );
     };
 
-    return function(targetTabId, openerTabId) {
+    return function(targetTabId, openerTabId, targetURL) {
+        var preempt = targetTabId === 'preempt';
+
         // Opener details.
         var tabContext = µb.tabContextManager.lookup(openerTabId);
         if ( tabContext === null ) { return; }
         var openerURL = tabContext.rawURL;
         if ( openerURL === '' ) { return; }
 
         // Popup details.
-        tabContext = µb.tabContextManager.lookup(targetTabId);
-        if ( tabContext === null ) { return; }
-        var targetURL = tabContext.rawURL;
-        if ( targetURL === '' ) { return; }
+        if ( targetURL === undefined ) {
+            tabContext = µb.tabContextManager.lookup(targetTabId);
+            if ( tabContext === null ) { return; }
+            targetURL = tabContext.rawURL;
+            if ( targetURL === '' ) { return; }
+        }
 
         // https://github.com/gorhill/uBlock/issues/341
         // Allow popups if uBlock is turned off in opener's context.
@@ -774,6 +778,11 @@ vAPI.tabs.onPopupUpdated = (function() {
             µb.updateBadgeAsync(openerTabId);
         }
 
+        if ( preempt ) {
+            // Block before tab is created
+            return true;
+        }
+
         // It is a popup, block and remove the tab.
         if ( popupType === 'popup' ) {
             µb.unbindTabFromPageStats(targetTabId);