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

Merge branch 'fix1025' of github.com:gorhill/uBlock

This commit is contained in:
gorhill 2015-03-15 14:23:34 -04:00
parent 38d308f1f0 a3abf7aa2b
commit 1641b5e012
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/1p-filters.js
View File

@ -171,4 +171,3 @@ uDom.onLoad(function() {
// https://www.youtube.com/watch?v=UNilsLf6eW4 // https://www.youtube.com/watch?v=UNilsLf6eW4
})(); })();

9
src/js/traffic.js
View File

@ -35,6 +35,7 @@
// This is to be used as last-resort fallback in case a tab is found to not // This is to be used as last-resort fallback in case a tab is found to not
// be bound while network requests are fired for the tab. // be bound while network requests are fired for the tab.
var mostRecentRootDocURLTimestamp = 0;
var mostRecentRootDocURL = ''; var mostRecentRootDocURL = '';
/******************************************************************************/ /******************************************************************************/
@ -63,6 +64,7 @@ var onBeforeRequest = function(details) {
pageStore.logRequest(pageStore, ''); pageStore.logRequest(pageStore, '');
} }
mostRecentRootDocURL = requestURL; mostRecentRootDocURL = requestURL;
mostRecentRootDocURLTimestamp = Date.now();
return; return;
} }
@ -76,6 +78,13 @@ var onBeforeRequest = function(details) {
// Lookup the page store associated with this tab id. // Lookup the page store associated with this tab id.
pageStore = µb.pageStoreFromTabId(tabId); pageStore = µb.pageStoreFromTabId(tabId);
if ( !pageStore ) { if ( !pageStore ) {
// https://github.com/gorhill/uBlock/issues/1025
// Google Hangout popup opens without a root frame. So for now we will
// just discard that best-guess root frame if it is too far in the
// future, at which point it ceases to be a "best guess".
if ( (Date.now() - mostRecentRootDocURLTimestamp) >= 500 ) {
mostRecentRootDocURL = '';
}
// https://github.com/gorhill/uBlock/issues/1001 // https://github.com/gorhill/uBlock/issues/1001
// Not a behind-the-scene request, yet no page store found for the // Not a behind-the-scene request, yet no page store found for the
// tab id: we will thus bind the last-seen root document to the // tab id: we will thus bind the last-seen root document to the