Skip to content

Sync scriptlets with upstream #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghostery-adblocker-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Sync scriptlets with upstream #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "index.js",
"type": "module",
"scripts": {
"build": "deno build.ts --tagName 1.68.1b7 > ubo.js",
"build": "deno build.ts --tagName 1.68.1rc1 > ubo.js",
"test": "node --test"
},
"author": {
Expand Down
78 changes: 64 additions & 14 deletions ubo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ function setAttrFn(
logPrefix,
selector = '',
attr = '',
value = ''
value = '',
options = {}
) {
if ( selector === '' ) { return; }
if ( attr === '' ) { return; }
Expand Down Expand Up @@ -123,7 +124,7 @@ function setAttrFn(
childList: true,
});
};
runAt(( ) => { start(); }, 'idle');
runAt(( ) => { start(); }, options.runAt || 'idle');
}
function safeSelf() {
if ( scriptletGlobals.safeSelf ) {
Expand Down Expand Up @@ -323,7 +324,6 @@ function setAttr(
const safe = safeSelf();
const logPrefix = safe.makeLogPrefix('set-attr', selector, attr, value);
const validValues = [ '', 'false', 'true' ];

if ( validValues.includes(value.toLowerCase()) === false ) {
if ( /^\d+$/.test(value) ) {
const n = parseInt(value, 10);
Expand All @@ -333,8 +333,8 @@ function setAttr(
return;
}
}

setAttrFn(false, logPrefix, selector, attr, value);
const options = safe.getExtraArgs(Array.from(arguments), 3);
setAttrFn(false, logPrefix, selector, attr, value, options);
};
setAttr(...args);
},
Expand Down Expand Up @@ -379,7 +379,8 @@ function setAttrFn(
logPrefix,
selector = '',
attr = '',
value = ''
value = '',
options = {}
) {
if ( selector === '' ) { return; }
if ( attr === '' ) { return; }
Expand Down Expand Up @@ -441,7 +442,7 @@ function setAttrFn(
childList: true,
});
};
runAt(( ) => { start(); }, 'idle');
runAt(( ) => { start(); }, options.runAt || 'idle');
}
function safeSelf() {
if ( scriptletGlobals.safeSelf ) {
Expand Down Expand Up @@ -640,7 +641,8 @@ function trustedSetAttr(
) {
const safe = safeSelf();
const logPrefix = safe.makeLogPrefix('trusted-set-attr', selector, attr, value);
setAttrFn(true, logPrefix, selector, attr, value);
const options = safe.getExtraArgs(Array.from(arguments), 3);
setAttrFn(true, logPrefix, selector, attr, value, options);
};
trustedSetAttr(...args);
},
Expand Down Expand Up @@ -1141,6 +1143,34 @@ function safeSelf() {
}
return safe;
}
function runAt(fn, when) {
const intFromReadyState = state => {
const targets = {
'loading': 1, 'asap': 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 ( Object.hasOwn(targets, prop) === false ) { continue; }
return targets[prop];
}
return 0;
};
const runAt = intFromReadyState(when);
if ( intFromReadyState(document.readyState) >= runAt ) {
fn(); return;
}
const onStateChange = ( ) => {
if ( intFromReadyState(document.readyState) < runAt ) { return; }
fn();
safe.removeEventListener.apply(document, args);
};
const safe = safeSelf();
const args = [ 'readystatechange', onStateChange, { capture: true } ];
safe.addEventListener.apply(document, args);
}
function trustedCreateHTML(
parentSelector,
htmlStr = '',
Expand All @@ -1150,6 +1180,7 @@ function trustedCreateHTML(
if ( htmlStr === '' ) { return; }
const safe = safeSelf();
const logPrefix = safe.makeLogPrefix('trusted-create-html', parentSelector, htmlStr, durationStr);
const extraArgs = safe.getExtraArgs(Array.from(arguments), 3);
// We do not want to recursively create elements
self.trustedCreateHTML = true;
let ancestor = self.frameElement;
Expand Down Expand Up @@ -1189,12 +1220,31 @@ function trustedCreateHTML(
setTimeout(remove, duration);
return true;
};
if ( append() ) { return; }
const observer = new MutationObserver(( ) => {
if ( append() === false ) { return; }
observer.disconnect();
});
observer.observe(document, { childList: true, subtree: true });
const start = ( ) => {
if ( append() ) { return; }
const observer = new MutationObserver(( ) => {
if ( append() === false ) { return; }
observer.disconnect();
});
const observerOptions = {
childList: true,
subtree: true,
};
if ( /[#.[]/.test(parentSelector) ) {
observerOptions.attributes = true;
if ( parentSelector.includes('[') === false ) {
observerOptions.attributeFilter = [];
if ( parentSelector.includes('#') ) {
observerOptions.attributeFilter.push('id');
}
if ( parentSelector.includes('.') ) {
observerOptions.attributeFilter.push('class');
}
}
}
observer.observe(document, observerOptions);
};
runAt(start, extraArgs.runAt || 'loading');
};
trustedCreateHTML(...args);
},
Expand Down