From 349d5d0862074f383e7e81858ec72c63d34f6d24 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 4 Jan 2022 10:43:56 +1000
Subject: [PATCH] Revert "Guarantee execution order of <script> elements
 (#1574)"

This reverts commit 36e20fd110151cdf532b7483369d18fd82888441.

Reverting until this can be investigated:

https://github.com/ankitects/anki/commit/36e20fd110151cdf532b7483369d18fd82888441#commitcomment-62861929
---
 ts/reviewer/index.ts | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/ts/reviewer/index.ts b/ts/reviewer/index.ts
index 0726edfc4..5aca4410e 100644
--- a/ts/reviewer/index.ts
+++ b/ts/reviewer/index.ts
@@ -59,16 +59,7 @@ export function _queueAction(action: Callback): void {
     _updatingQueue = _updatingQueue.then(action);
 }
 
-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> {
+function setInnerHTML(element: Element, html: string): void {
     for (const oldVideo of element.getElementsByTagName("video")) {
         oldVideo.pause();
 
@@ -82,11 +73,14 @@ async function setInnerHTML(element: Element, html: string): Promise<void> {
     element.innerHTML = html;
 
     for (const oldScript of element.getElementsByTagName("script")) {
-        if (oldScript.src) {
-            await replaceScriptPromise(oldScript);
-        } else {
-            oldScript.replaceWith(oldScript.cloneNode(true));
+        const newScript = document.createElement("script");
+
+        for (const attribute of oldScript.attributes) {
+            newScript.setAttribute(attribute.name, attribute.value);
         }
+
+        newScript.appendChild(document.createTextNode(oldScript.innerHTML));
+        oldScript.parentNode!.replaceChild(newScript, oldScript);
     }
 }