Fix for #1176 #1179

AlexVallat · Apr 4, 2015

This should fix #1176, and I don't think there's any good reason to onNavigate in noTab.

AlexVallat Fix for #1176 a694d1e

chrisaljoudi merged commit 213ab01 into chrisaljoudi:master Apr 4, 2015

AlexVallat deleted the AlexVallat:Fix_for_1176 branch Apr 4, 2015

@@ @@ -1326,7 +1326,9 @@ vAPI.net.registerListeners = function() { @@
              var details = e.data;
              var browser = e.target;
              var tabId = vAPI.tabs.getTabId(browser);
-    -
+    +        if (tabId === vAPI.noTabId) {
+    +            return; // Do not navigate for behind the scenes
+    +        }
              //console.debug("nsIWebProgressListener: onLocationChange: " + details.url + " (" + details.flags + ")");
              // LOCATION_CHANGE_SAME_DOCUMENT = "did not load a new document"

@@ @@ -743,7 +743,7 @@ uDom.onLoad(function () { @@
          var tabId = null; //If there's no tab ID specified in the query string, it will default to current tab.
          // Extract the tab id of the page this popup is for
-    -    var matches = window.location.search.match(/[\?&]tabId=([^&]+)/);
+    +    var matches = window.location && window.location.search.match(/[\?&]tabId=([^&]+)/);
          if (matches && matches.length === 2) {
              tabId = matches[1];
          }

chrisaljoudi/uBlock