prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mind other old constructs for scriptlets

Browse source 
Related feedback:
https://old.reddit.com/r/uBlockOrigin/comments/1jmcqhn/

Related commit:
https://github.com/gorhill/uBlock/commit/44c038b9a1
This commit is contained in:
Raymond Hill 2025-03-29 09:54:41 -04:00
parent 44c038b9a1
commit b381ceda72
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/js/scriptlet-filtering-core.js
View file

@ -67,8 +67,10 @@ const lookupScriptlet = (rawToken, mainMap, isolatedMap, debug = false) => {
const details = reng.contentFromName(token, 'text/javascript'); const details = reng.contentFromName(token, 'text/javascript');
if ( details === undefined ) { return; } if ( details === undefined ) { return; }
const targetWorldMap = details.world !== 'ISOLATED' ? mainMap : isolatedMap; const targetWorldMap = details.world !== 'ISOLATED' ? mainMap : isolatedMap;
const content = patchScriptlet(details.js, args.slice(1)); const match = /^function\s+([^(\s]+)\s*\(/.exec(details.js);
if ( content.startsWith('(function(') === false ) { const fname = match && match[1];
const content = patchScriptlet(fname, details.js, args.slice(1));
if ( fname ) {
targetWorldMap.set(token, details.js); targetWorldMap.set(token, details.js);
} }
const dependencies = details.dependencies || []; const dependencies = details.dependencies || [];
@ -92,10 +94,9 @@ const lookupScriptlet = (rawToken, mainMap, isolatedMap, debug = false) => {
}; };
// Fill-in scriptlet argument placeholders. // Fill-in scriptlet argument placeholders.
const patchScriptlet = (content, arglist) => { const patchScriptlet = (fname, content, arglist) => {
const match = /^function\s+([^(\s]+)\s*\(/.exec(content); if ( fname ) {
if ( match ) { content = `${fname}({{args}});`;
content = `${match[1]}({{args}});`;
} else { } else {
for ( let i = 0; i < arglist.length; i++ ) { for ( let i = 0; i < arglist.length; i++ ) {
content = content.replace(`{{${i+1}}}`, arglist[i]); content = content.replace(`{{${i+1}}}`, arglist[i]);