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

Fixing #1017, only apply switch to about:blank or about:newtab if not loading

This commit is contained in:
AlexVallat 2015-03-15 16:05:39 +00:00
parent 05540108b7
commit 50804eb1bb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) {