Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-04 16:47:15 +02:00
Code Issues Releases Wiki Activity

Fix eslint warnings

Browse Source
This commit is contained in:
Raymond Hill 2024-04-03 10:22:57 -04:00
parent 8dc0e885b5
commit 4533f0e37e
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 281 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/js/cachestorage.js
View File

@ -19,17 +19,14 @@
Home: https://github.com/gorhill/uBlock Home: https://github.com/gorhill/uBlock
*/ */
/* global indexedDB */
'use strict';
/******************************************************************************/ /******************************************************************************/
import * as s14e from './s14e-serializer.js';
import lz4Codec from './lz4.js'; import lz4Codec from './lz4.js';
import { ubolog } from './console.js';
import webext from './webext.js'; import webext from './webext.js';
import µb from './background.js'; import µb from './background.js';
import { ubolog } from './console.js';
import * as s14e from './s14e-serializer.js';
/******************************************************************************/ /******************************************************************************/
@ -47,6 +44,10 @@ const keysFromGetArg = arg => {
let fastCache = 'indexedDB'; let fastCache = 'indexedDB';
// https://eslint.org/docs/latest/rules/no-prototype-builtins
const hasOwnProperty = (o, p) =>
Object.prototype.hasOwnProperty.call(o, p);
/******************************************************************************* /*******************************************************************************
* *
* Extension storage * Extension storage
@ -65,7 +66,7 @@ const cacheStorage = (( ) => {
if ( found.length === wanted.length ) { return; } if ( found.length === wanted.length ) { return; }
const missing = []; const missing = [];
for ( const key of wanted ) { for ( const key of wanted ) {
if ( outbin.hasOwnProperty(key) ) { continue; } if ( hasOwnProperty(outbin, key) ) { continue; }
missing.push(key); missing.push(key);
} }
return missing; return missing;
@ -107,7 +108,7 @@ const cacheStorage = (( ) => {
if ( argbin instanceof Object === false ) { return; } if ( argbin instanceof Object === false ) { return; }
if ( Array.isArray(argbin) ) { return; } if ( Array.isArray(argbin) ) { return; }
for ( const key of wanted ) { for ( const key of wanted ) {
if ( argbin.hasOwnProperty(key) === false ) { continue; } if ( hasOwnProperty(argbin, key) === false ) { continue; }
outbin[key] = argbin[key]; outbin[key] = argbin[key];
} }
}).then(( ) => { }).then(( ) => {
@ -165,7 +166,7 @@ const cacheStorage = (( ) => {
}, },
select(api) { select(api) {
if ( cacheAPIs.hasOwnProperty(api) === false ) { return fastCache; } if ( hasOwnProperty(cacheAPIs, api) === false ) { return fastCache; }
fastCache = api; fastCache = api;
for ( const k of Object.keys(cacheAPIs) ) { for ( const k of Object.keys(cacheAPIs) ) {
if ( k === api ) { continue; } if ( k === api ) { continue; }
@ -673,7 +674,7 @@ const idbStorage = (( ) => {
} }
if ( argbin instanceof Object && Array.isArray(argbin) === false ) { if ( argbin instanceof Object && Array.isArray(argbin) === false ) {
for ( const key of keys ) { for ( const key of keys ) {
if ( outbin.hasOwnProperty(key) ) { continue; } if ( hasOwnProperty(outbin, key) ) { continue; }
outbin[key] = argbin[key]; outbin[key] = argbin[key];
} }
} }

12
src/js/s14e-serializer.js
View File

@ -19,8 +19,6 @@
Home: https://github.com/gorhill/uBlock Home: https://github.com/gorhill/uBlock
*/ */
'use strict';
/******************************************************************************* /*******************************************************************************
* *
* Structured-Cloneable to Unicode-Only SERIALIZER * Structured-Cloneable to Unicode-Only SERIALIZER
@ -287,6 +285,9 @@ const shouldCompress = (s, options) =>
options.compressThreshold <= s.length options.compressThreshold <= s.length
); );
const hasOwnProperty = (o, p) =>
Object.prototype.hasOwnProperty.call(o, p);
/******************************************************************************* /*******************************************************************************
* *
* A large Uint is always a positive integer (can be zero), assumed to be * A large Uint is always a positive integer (can be zero), assumed to be
@ -1128,7 +1129,7 @@ export const getConfig = ( ) => Object.assign({}, currentConfig);
export const setConfig = config => { export const setConfig = config => {
for ( const key in Object.keys(config) ) { for ( const key in Object.keys(config) ) {
if ( defaultConfig.hasOwnProperty(key) === false ) { continue; } if ( hasOwnProperty(defaultConfig, key) === false ) { continue; }
const val = config[key]; const val = config[key];
if ( typeof val !== typeof defaultConfig[key] ) { continue; } if ( typeof val !== typeof defaultConfig[key] ) { continue; }
if ( (validateConfig[key])(val) === false ) { continue; } if ( (validateConfig[key])(val) === false ) { continue; }
@ -1389,15 +1390,18 @@ if ( isInstanceOf(globalThis, 'DedicatedWorkerGlobalScope') ) {
setConfig(msg.config); setConfig(msg.config);
globalThis.postMessage({ what: THREAD_IAMREADY }); globalThis.postMessage({ what: THREAD_IAMREADY });
break; break;
case THREAD_SERIALIZE: case THREAD_SERIALIZE: {
const result = serialize(msg.data, msg.options); const result = serialize(msg.data, msg.options);
globalThis.postMessage({ id: msg.id, size: msg.size, result }); globalThis.postMessage({ id: msg.id, size: msg.size, result });
break; break;
}
case THREAD_DESERIALIZE: { case THREAD_DESERIALIZE: {
const result = deserialize(msg.data); const result = deserialize(msg.data);
globalThis.postMessage({ id: msg.id, size: msg.size, result }); globalThis.postMessage({ id: msg.id, size: msg.size, result });
break; break;
} }
default:
break;
} }
}; };
} }