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

code review

This commit is contained in:
gorhill 2014-07-26 09:55:12 -04:00
parent fdc8bd17b9
commit 2d37a9392e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/traffic.js
View File

@ -29,7 +29,7 @@
/******************************************************************************/ /******************************************************************************/
// Intercept and filter web requests according to white and black lists. // Intercept and filter web requests.
var onBeforeRequest = function(details) { var onBeforeRequest = function(details) {
//console.debug('onBeforeRequest()> "%s": %o', details.url, details); //console.debug('onBeforeRequest()> "%s": %o', details.url, details);
@ -94,6 +94,11 @@ var onBeforeRequest = function(details) {
// Intercept root frame requests. This is where we identify and block popups. // Intercept root frame requests. This is where we identify and block popups.
var onBeforeSendHeaders = function(details) { var onBeforeSendHeaders = function(details) {
// TODO: I vaguely remember reading that when pre-fetch is enabled,
// the tab id could be -1, despite the request not really being a
// behind-the-scene request. If true, the test below would prevent
// the popup blocker from working. Need to check this.
// Do not block behind the scene requests. // Do not block behind the scene requests.
var tabId = details.tabId; var tabId = details.tabId;
if ( tabId < 0 ) { if ( tabId < 0 ) {
@ -140,6 +145,10 @@ var onBeforeSendHeaders = function(details) {
}; };
//console.debug('Referrer="%s"', referrer); //console.debug('Referrer="%s"', referrer);
// TODO: I think I should test the switch of the referrer instead, not the
// switch of the popup. If so, that would require being able to lookup
// a page store from a URL. Have to keep in mind the same URL can appear
// in multiple tabs.
var reason = false; var reason = false;
if ( µb.getNetFilteringSwitch(pageStore.pageHostname) ) { if ( µb.getNetFilteringSwitch(pageStore.pageHostname) ) {
reason = µb.abpFilters.matchString( reason = µb.abpFilters.matchString(