mirror of
https://github.com/gorhill/uMatrix.git
synced 2024-09-30 00:56:32 +13:00
code review
This commit is contained in:
parent
c1314e496b
commit
c0bfb00be8
1 changed files with 8 additions and 6 deletions
|
@ -1121,9 +1121,8 @@ var httpObserver = {
|
||||||
};
|
};
|
||||||
|
|
||||||
var onBeforeRequest = vAPI.net.onBeforeRequest;
|
var onBeforeRequest = vAPI.net.onBeforeRequest;
|
||||||
if ( onBeforeRequest.types.size === 0 || onBeforeRequest.types.has(type) ) {
|
if ( !onBeforeRequest.types || onBeforeRequest.types.has(type) ) {
|
||||||
result = onBeforeRequest.callback(callbackDetails);
|
result = onBeforeRequest.callback(callbackDetails);
|
||||||
|
|
||||||
if ( typeof result === 'object' && result.cancel === true ) {
|
if ( typeof result === 'object' && result.cancel === true ) {
|
||||||
channel.cancel(this.ABORT);
|
channel.cancel(this.ABORT);
|
||||||
return true;
|
return true;
|
||||||
|
@ -1139,7 +1138,7 @@ var httpObserver = {
|
||||||
}
|
}
|
||||||
|
|
||||||
var onBeforeSendHeaders = vAPI.net.onBeforeSendHeaders;
|
var onBeforeSendHeaders = vAPI.net.onBeforeSendHeaders;
|
||||||
if ( onBeforeSendHeaders.types.size === 0 || onBeforeSendHeaders.types.has(type) ) {
|
if ( !onBeforeSendHeaders.types || onBeforeSendHeaders.types.has(type) ) {
|
||||||
callbackDetails.requestHeaders = httpRequestHeadersFactory(channel);
|
callbackDetails.requestHeaders = httpRequestHeadersFactory(channel);
|
||||||
result = onBeforeSendHeaders.callback(callbackDetails);
|
result = onBeforeSendHeaders.callback(callbackDetails);
|
||||||
callbackDetails.requestHeaders.dispose();
|
callbackDetails.requestHeaders.dispose();
|
||||||
|
@ -1148,7 +1147,6 @@ var httpObserver = {
|
||||||
channel.cancel(this.ABORT);
|
channel.cancel(this.ABORT);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -1317,8 +1315,12 @@ vAPI.net = {};
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.net.registerListeners = function() {
|
vAPI.net.registerListeners = function() {
|
||||||
this.onBeforeRequest.types = new Set(this.onBeforeRequest.types);
|
this.onBeforeRequest.types = this.onBeforeRequest.types ?
|
||||||
this.onBeforeSendHeaders.types = new Set(this.onBeforeSendHeaders.types);
|
new Set(this.onBeforeRequest.types) :
|
||||||
|
null;
|
||||||
|
this.onBeforeSendHeaders.types = this.onBeforeSendHeaders.types ?
|
||||||
|
new Set(this.onBeforeSendHeaders.types) :
|
||||||
|
null;
|
||||||
|
|
||||||
var shouldLoadListenerMessageName = location.host + ':shouldLoad';
|
var shouldLoadListenerMessageName = location.host + ':shouldLoad';
|
||||||
var shouldLoadListener = function(e) {
|
var shouldLoadListener = function(e) {
|
||||||
|
|
Loading…
Reference in a new issue