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

Merge pull request #1179 from AlexVallat/Fix_for_1176 

Fix for #1176
This commit is contained in:
Chris Aljoudi 2015-04-04 02:48:02 -06:00
parent 0083784289 a694d1ed60
commit 213ab01dba
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/firefox/vapi-background.js
View File

@ -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"

2
src/js/popup.js
View File

@ -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];
}