langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guarantee execution order of <script> elements (#1574)

Browse Source
This commit is contained in:
Hikaru Y 2022-01-04 07:58:09 +09:00 committed by GitHub
parent 35c8449ab2
commit 36e20fd110
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ts/reviewer/index.ts
View File

@ -59,7 +59,16 @@ export function _queueAction(action: Callback): void {
_updatingQueue = _updatingQueue.then(action); _updatingQueue = _updatingQueue.then(action);
} }
function setInnerHTML(element: Element, html: string): void { function replaceScriptPromise(script: HTMLScriptElement): Promise<void> {
return new Promise((resolve) => {
const newScript = script.cloneNode(true);
newScript.addEventListener("load", () => resolve());
newScript.addEventListener("error", () => resolve());
script.replaceWith(newScript);
});
}
async function setInnerHTML(element: Element, html: string): Promise<void> {
for (const oldVideo of element.getElementsByTagName("video")) { for (const oldVideo of element.getElementsByTagName("video")) {
oldVideo.pause(); oldVideo.pause();
@ -73,14 +82,11 @@ function setInnerHTML(element: Element, html: string): void {
element.innerHTML = html; element.innerHTML = html;
for (const oldScript of element.getElementsByTagName("script")) { for (const oldScript of element.getElementsByTagName("script")) {
const newScript = document.createElement("script"); if (oldScript.src) {
await replaceScriptPromise(oldScript);
for (const attribute of oldScript.attributes) { } else {
newScript.setAttribute(attribute.name, attribute.value); oldScript.replaceWith(oldScript.cloneNode(true));
} }
newScript.appendChild(document.createTextNode(oldScript.innerHTML));
oldScript.parentNode!.replaceChild(newScript, oldScript);
} }
} }