From e247f28b73c3e4e69a733fd635875d9062ff8155 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Sun, 14 Jun 2015 07:46:58 -0400
Subject: [PATCH] this fixes
 https://github.com/gorhill/uBlock/issues/341#issuecomment-111758109

---
 src/js/tab.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/js/tab.js b/src/js/tab.js
index 1c28b5007..6ce9ca778 100644
--- a/src/js/tab.js
+++ b/src/js/tab.js
@@ -461,14 +461,17 @@ vAPI.tabs.onPopup = function(details) {
     if ( tabContext.tabId === details.openerTabId ) {
         openerURL = tabContext.normalURL;
     }
-
     if ( openerURL === '' ) {
         return;
     }
 
     var µburi = µb.URI;
-    var openerHostname = µburi.hostnameFromURI(openerURL);
-    var openerDomain = µburi.domainFromHostname(openerHostname);
+
+    // https://github.com/gorhill/uBlock/issues/341
+    // Allow popups if uBlock is turned off in opener's context.
+    if ( µb.getNetFilteringSwitch(openerURL) === false ) {
+        return;
+    }
 
     var targetURL = details.targetURL;
 
@@ -481,6 +484,8 @@ vAPI.tabs.onPopup = function(details) {
         }
     }
 
+    var openerHostname = µburi.hostnameFromURI(openerURL);
+    var openerDomain = µburi.domainFromHostname(openerHostname);
     var context = {
         pageHostname: openerHostname,
         pageDomain: openerDomain,
@@ -501,15 +506,13 @@ vAPI.tabs.onPopup = function(details) {
 
     // https://github.com/chrisaljoudi/uBlock/issues/323
     // https://github.com/chrisaljoudi/uBlock/issues/1142
-    // If popup OR opener URL is whitelisted, do not block the popup
+    // Don't block if uBlock is turned off in popup's context
     if (
         result === '' &&
-        µb.getNetFilteringSwitch(openerURL) &&
-        µb.getNetFilteringSwitch(targetURL)
+        µb.getNetFilteringSwitch(targetURL) &&
+        µb.staticNetFilteringEngine.matchStringExactType(context, targetURL, 'popup') !== undefined
     ) {
-        if ( µb.staticNetFilteringEngine.matchStringExactType(context, targetURL, 'popup') !== undefined ) {
-            result = µb.staticNetFilteringEngine.toResultString(loggerEnabled);
-        }
+        result = µb.staticNetFilteringEngine.toResultString(loggerEnabled);
     }
 
     // https://github.com/chrisaljoudi/uBlock/issues/91
@@ -517,6 +520,7 @@ vAPI.tabs.onPopup = function(details) {
     if ( pageStore ) {
         pageStore.logRequest(context, result);
     }
+
     if ( loggerEnabled ) {
         µb.logger.writeOne(
             details.openerTabId,