Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix/improve scriptlets 

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/2678
- https://github.com/uBlockOrigin/uAssets/issues/18278
This commit is contained in:
Raymond Hill 2023-05-30 08:38:35 -04:00
parent 996bf0925d
commit 56e1d92dbd
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
assets/resources/scriptlets.js
View File

@ -1049,23 +1049,11 @@ function evaldataPrune(
) { ) {
self.eval = new Proxy(self.eval, { self.eval = new Proxy(self.eval, {
apply(target, thisArg, args) { apply(target, thisArg, args) {
let dataToEval = `${args[0]}`; let data = Reflect.apply(target, thisArg, args);
const match = /^\s*\(\s*(\{.+\})\s*\)\s*$/s.exec(dataToEval); if ( typeof data === 'object' ) {
if ( match !== null ) { data = objectPrune(data, rawPrunePaths, rawNeedlePaths);
dataToEval = match[1];
} }
let data; return data;
try {
data = JSON.parse(dataToEval);
if ( typeof data === 'object' ) {
let after = JSON.stringify(
objectPrune(data, rawPrunePaths, rawNeedlePaths)
);
args[0] = `(${after})`;
}
} catch(ex) {
}
return Reflect.apply(target, thisArg, args);
} }
}); });
} }
@ -2332,7 +2320,7 @@ function hrefSanitizer(
}; };
const extractText = (elem, source) => { const extractText = (elem, source) => {
if ( /^\[.*\]$/.test(source) ) { if ( /^\[.*\]$/.test(source) ) {
return elem.getAttribute(source.slice(1,-1).trim()) || ''; source = elem.getAttribute(source.slice(1,-1).trim()) || '';
} }
if ( source !== 'text' ) { return ''; } if ( source !== 'text' ) { return ''; }
const text = elem.textContent const text = elem.textContent