|
|
@ -308,7 +308,8 @@ var tabWatcher = {
|
|
|
|
|
|
|
|
|
|
|
|
onTabSelect: function({target}) {
|
|
|
|
onTabSelect: function({target}) {
|
|
|
|
// target is tab in Firefox, browser in Fennec
|
|
|
|
// target is tab in Firefox, browser in Fennec
|
|
|
|
var URI = (target.linkedBrowser || target).currentURI;
|
|
|
|
var browser = (target.linkedBrowser || target);
|
|
|
|
|
|
|
|
var URI = browser.currentURI;
|
|
|
|
var aboutPath = URI.schemeIs('about') && URI.path;
|
|
|
|
var aboutPath = URI.schemeIs('about') && URI.path;
|
|
|
|
var tabId = vAPI.tabs.getTabId(target);
|
|
|
|
var tabId = vAPI.tabs.getTabId(target);
|
|
|
|
|
|
|
|
|
|
|
@ -317,11 +318,13 @@ var tabWatcher = {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
vAPI.tabs.onNavigation({
|
|
|
|
if ( browser.webNavigation.busyFlags === 0 /*BUSY_FLAGS_NONE*/ ) {
|
|
|
|
frameId: 0,
|
|
|
|
vAPI.tabs.onNavigation({
|
|
|
|
tabId: tabId,
|
|
|
|
frameId: 0,
|
|
|
|
url: URI.asciiSpec
|
|
|
|
tabId: tabId,
|
|
|
|
});
|
|
|
|
url: URI.asciiSpec
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
onLocationChange: function(browser, webProgress, request, location, flags) {
|
|
|
|
onLocationChange: function(browser, webProgress, request, location, flags) {
|
|
|
|