Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-06 09:37:12 +02:00
Code Issues Releases Wiki Activity

fix #3441

Browse Source
This commit is contained in:
Raymond Hill 2018-01-16 09:13:51 -05:00
parent 32bde274b9
commit 1c468035dd
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
platform/webext/vapi-webrequest.js
View File

@ -61,46 +61,41 @@ vAPI.net.registerListeners = function() {
var wrApi = browser.webRequest;
// legacy Chromium understands only these network request types.
var validTypes = {
main_frame: true,
sub_frame: true,
stylesheet: true,
script: true,
image: true,
object: true,
xmlhttprequest: true,
other: true
};
var validTypes = new Set([
'image',
'main_frame',
'object',
'other',
'script',
'stylesheet',
'sub_frame',
'xmlhttprequest',
]);
// modern Chromium/WebExtensions: more types available.
if ( wrApi.ResourceType ) {
for ( let typeKey in wrApi.ResourceType ) {
if ( wrApi.ResourceType.hasOwnProperty(typeKey) ) {
validTypes[wrApi.ResourceType[typeKey]] = true;
validTypes.add(wrApi.ResourceType[typeKey]);
}
}
}
var denormalizeTypes = function(aa) {
if ( aa.length === 0 ) {
return Object.keys(validTypes);
return Array.from(validTypes);
}
var out = [];
var i = aa.length,
type,
needOther = true;
var out = new Set(),
i = aa.length;
while ( i-- ) {
type = aa[i];
if ( validTypes[type] ) {
out.push(type);
var type = aa[i];
if ( validTypes.has(type) ) {
out.add(type);
}
if ( type === 'other' ) {
needOther = false;
if ( type === 'image' && validTypes.has('imageset') ) {
out.add('imageset');
}
}
if ( needOther ) {
out.push('other');
}
return out;
return Array.from(out);
};
var punycode = self.punycode;
@ -144,7 +139,7 @@ vAPI.net.registerListeners = function() {
let urls = this.onBeforeRequest.urls || ['<all_urls>'];
let types = this.onBeforeRequest.types || undefined;
if (
(validTypes.websocket) &&
(validTypes.has('websocket')) &&
(types === undefined || types.indexOf('websocket') !== -1) &&
(urls.indexOf('<all_urls>') === -1)
) {