mirror of
https://github.com/gorhill/uBlock.git
synced 2024-11-10 01:02:08 +01:00
Revert "Render List stats below on mobile"
This reverts commit 9ea39886b6
.
This commit is contained in:
parent
b0219570b6
commit
df5437a54f
2 changed files with 12 additions and 38 deletions
|
@ -130,18 +130,13 @@ builtinScriptlets.push({
|
|||
});
|
||||
function runAt(fn, when) {
|
||||
const intFromReadyState = state => {
|
||||
const targets = {
|
||||
'loading': 1,
|
||||
'interactive': 2, 'end': 2, '2': 2,
|
||||
'complete': 3, 'idle': 3, '3': 3,
|
||||
};
|
||||
const tokens = Array.isArray(state) ? state : [ state ];
|
||||
for ( const token of tokens ) {
|
||||
const prop = `${token}`;
|
||||
if ( targets.hasOwnProperty(prop) === false ) { continue; }
|
||||
return targets[prop];
|
||||
}
|
||||
return 0;
|
||||
return ({
|
||||
loading: 1,
|
||||
interactive: 2,
|
||||
end: 2,
|
||||
complete: 3,
|
||||
idle: 3,
|
||||
})[`${state}`] || 0;
|
||||
};
|
||||
const runAt = intFromReadyState(when);
|
||||
if ( intFromReadyState(document.readyState) >= runAt ) {
|
||||
|
@ -1035,22 +1030,14 @@ builtinScriptlets.push({
|
|||
function setConstant(
|
||||
arg1 = '',
|
||||
arg2 = '',
|
||||
arg3 = ''
|
||||
arg3 = 0
|
||||
) {
|
||||
const details = typeof arg1 !== 'object'
|
||||
? { prop: arg1, value: arg2 }
|
||||
? { prop: arg1, value: arg2, runAt: parseInt(arg3, 10) || 0 }
|
||||
: arg1;
|
||||
if ( arg3 !== '' ) {
|
||||
if ( /^\d$/.test(arg3) ) {
|
||||
details.options = [ arg3 ];
|
||||
} else {
|
||||
details.options = Array.from(arguments).slice(2);
|
||||
}
|
||||
}
|
||||
const { prop: chain = '', value: cValue = '' } = details;
|
||||
if ( typeof chain !== 'string' ) { return; }
|
||||
if ( chain === '' ) { return; }
|
||||
const options = details.options || [];
|
||||
function setConstant(chain, cValue) {
|
||||
const trappedProp = (( ) => {
|
||||
const pos = chain.lastIndexOf('.');
|
||||
|
@ -1106,20 +1093,13 @@ function setConstant(
|
|||
cValue = cloakFunc(function(){ return true; });
|
||||
} else if ( cValue === 'falseFunc' ) {
|
||||
cValue = cloakFunc(function(){ return false; });
|
||||
} else if ( /^-?\d+$/.test(cValue) ) {
|
||||
cValue = parseInt(cValue);
|
||||
} else if ( /^\d+$/.test(cValue) ) {
|
||||
cValue = parseFloat(cValue);
|
||||
if ( isNaN(cValue) ) { return; }
|
||||
if ( Math.abs(cValue) > 0x7FFF ) { return; }
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
if ( options.includes('asCallback') ) {
|
||||
cValue = ( ) => cValue;
|
||||
} else if ( options.includes('asResolve') ) {
|
||||
cValue = Promise.resolve(cValue);
|
||||
} else if ( options.includes('asReject') ) {
|
||||
cValue = Promise.reject(cValue);
|
||||
}
|
||||
let aborted = false;
|
||||
const mustAbort = function(v) {
|
||||
if ( aborted ) { return true; }
|
||||
|
@ -1213,7 +1193,7 @@ function setConstant(
|
|||
}
|
||||
runAt(( ) => {
|
||||
setConstant(chain, cValue);
|
||||
}, options);
|
||||
}, details.runAt);
|
||||
}
|
||||
|
||||
/******************************************************************************/
|
||||
|
|
|
@ -182,12 +182,6 @@ const renderFilterLists = ( ) => {
|
|||
}
|
||||
for ( const [ listkey, listDetails ] of treeEntries ) {
|
||||
const listEntry = createListEntry(listDetails, depth);
|
||||
if ( dom.cl.has(dom.root, 'mobile') ) {
|
||||
const leafStats = qs$(listEntry, '.leafstats');
|
||||
if ( leafStats ) {
|
||||
listEntry.append(leafStats);
|
||||
}
|
||||
}
|
||||
listEntry.dataset.key = listkey;
|
||||
listEntry.dataset.parent = parentkey;
|
||||
dom.text(qs$(listEntry, '.listname'), listDetails.title);
|
||||
|
|
Loading…
Reference in a new issue