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

[mv3] Avoid passing empty arrays to scripting.registerContentScripts

Browse source 
Maybe related issue:
https://github.com/uBlockOrigin/uBOL-home/issues/344
This commit is contained in:
Raymond Hill 2025-05-15 11:20:52 -04:00
parent a551d1cc01
commit 4c99471a25
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
platform/mv3/extension/js/scripting-manager.js
View file

@ -143,10 +143,14 @@ function registerHighGeneric(context, genericDetails) {
id: 'css-generichigh',
css,
allFrames: true,
matches,
excludeMatches,
runAt: 'document_end',
};
if ( matches.length !== 0 ) {
directive.matches = matches;
}
if ( excludeMatches.length !== 0 ) {
directive.excludeMatches = excludeMatches;
}
// register
if ( registered === undefined ) {
@ -239,9 +243,12 @@ function registerGeneric(context, genericDetails) {
js,
allFrames: true,
matches: [ '<all_urls>' ],
excludeMatches,
runAt: 'document_idle',
};
if ( excludeMatches.length !== 0 ) {
directiveAll.excludeMatches = excludeMatches;
}
if ( registeredAll === undefined ) { // register
context.toAdd.push(directiveAll);
} else if ( // update
@ -317,10 +324,14 @@ function registerProcedural(context) {
id: 'css-procedural',
js,
allFrames: true,
matches,
excludeMatches,
runAt: 'document_start',
};
if ( matches.length !== 0 ) {
directive.matches = matches;
}
if ( excludeMatches.length !== 0 ) {
directive.excludeMatches = excludeMatches;
}
// register
if ( registered === undefined ) {
@ -379,10 +390,14 @@ function registerDeclarative(context) {
id: 'css-declarative',
js,
allFrames: true,
matches,
excludeMatches,
runAt: 'document_start',
};
if ( matches.length !== 0 ) {
directive.matches = matches;
}
if ( excludeMatches.length !== 0 ) {
directive.excludeMatches = excludeMatches;
}
// register
if ( registered === undefined ) {
@ -441,10 +456,14 @@ function registerSpecific(context) {
id: 'css-specific',
js,
allFrames: true,
matches,
excludeMatches,
runAt: 'document_start',
};
if ( matches.length !== 0 ) {
directive.matches = matches;
}
if ( excludeMatches.length !== 0 ) {
directive.excludeMatches = excludeMatches;
}
// register
if ( registered === undefined ) {
@ -518,12 +537,16 @@ function registerScriptlet(context, scriptletDetails) {
id,
js: [ `/rulesets/scripting/scriptlet/${id}.js` ],
allFrames: true,
matches,
excludeMatches,
matchOriginAsFallback: true,
runAt: 'document_start',
world: details.world,
};
if ( matches.length !== 0 ) {
directive.matches = matches;
}
if ( excludeMatches.length !== 0 ) {
directive.excludeMatches = excludeMatches;
}
// register
if ( registered === undefined ) {