Skip to content
This repository was archived by the owner on Sep 9, 2022. It is now read-only.

Fix for #1176 #1179

Merged
merged 1 commit into from
Apr 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion platform/firefox/vapi-background.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/js/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
Expand Down