prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

code review: remove old cruft

Browse source
This commit is contained in:
gorhill 2017-03-05 17:20:28 -05:00
parent 4c832718d3
commit c271fbbd0d
1 changed files with 31 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
platform/chromium/vapi-background.js
View file

@ -1092,64 +1092,40 @@ vAPI.net.registerListeners = function() {
return onHeadersReceivedClient(details); return onHeadersReceivedClient(details);
}; };
var urls, types;
var installListeners = (function() { if ( onBeforeRequest ) {
//listener = function(details) { urls = this.onBeforeRequest.urls || ['<all_urls>'];
// quickProfiler.start('onBeforeRequest'); types = this.onBeforeRequest.types || undefined;
// var r = onBeforeRequest(details); wrApi.onBeforeRequest.addListener(
// quickProfiler.stop(); onBeforeRequest,
// return r; { urls: urls, types: types },
//}; this.onBeforeRequest.extra
var urls, types; );
}
if ( // Chromium 48 and lower does not support `ping` type.
onBeforeRequest && // Chromium 56 and higher does support `csp_report` stype.
wrApi.onBeforeRequest.hasListener(onBeforeRequest) === false if ( onBeforeSendHeaders ) {
) { wrApi.onBeforeSendHeaders.addListener(
urls = this.onBeforeRequest.urls || ['<all_urls>']; onBeforeSendHeaders,
types = this.onBeforeRequest.types || undefined; {
wrApi.onBeforeRequest.addListener( 'urls': [ '<all_urls>' ],
onBeforeRequest, 'types': [ 'ping' ]
{ urls: urls, types: types }, },
this.onBeforeRequest.extra [ 'blocking', 'requestHeaders' ]
); );
} }
// Chromium 48 and lower does not support `ping` type. if ( onHeadersReceived ) {
// Chromium 56 and higher does support `csp_report` stype. urls = this.onHeadersReceived.urls || ['<all_urls>'];
if ( types = onHeadersReceivedTypes;
onBeforeSendHeaders && wrApi.onHeadersReceived.addListener(
wrApi.onBeforeSendHeaders.hasListener(onBeforeSendHeaders) === false onHeadersReceived,
) { { urls: urls, types: types },
wrApi.onBeforeSendHeaders.addListener( this.onHeadersReceived.extra
onBeforeSendHeaders, );
{ }
'urls': [ '<all_urls>' ],
'types': [ 'ping' ]
},
[ 'blocking', 'requestHeaders' ]
);
}
if (
onHeadersReceived &&
wrApi.onHeadersReceived.hasListener(onHeadersReceived) === false
) {
urls = this.onHeadersReceived.urls || ['<all_urls>'];
types = onHeadersReceivedTypes;
wrApi.onHeadersReceived.addListener(
onHeadersReceived,
{ urls: urls, types: types },
this.onHeadersReceived.extra
);
}
// https://github.com/gorhill/uBlock/issues/675
// Experimental: keep polling to be sure our listeners are still installed.
//setTimeout(installListeners, 20000);
}).bind(this);
installListeners();
}; };
/******************************************************************************/ /******************************************************************************/