From d05a5f3c46d8baa0d6935e5387caf7ca5ba4235e Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 21 Apr 2020 21:14:54 -0400
Subject: [PATCH 1/2] Create dynamic script/CSS loader utility

---
 ext/mixed/js/dynamic-loader-sentinel.js | 18 ++++++
 ext/mixed/js/dynamic-loader.js          | 80 +++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 ext/mixed/js/dynamic-loader-sentinel.js
 create mode 100644 ext/mixed/js/dynamic-loader.js

diff --git a/ext/mixed/js/dynamic-loader-sentinel.js b/ext/mixed/js/dynamic-loader-sentinel.js
new file mode 100644
index 00000000..f783bdb7
--- /dev/null
+++ b/ext/mixed/js/dynamic-loader-sentinel.js
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2020  Yomichan Authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+yomichan.trigger('dynamicLoaderSentinel', {script: document.currentScript});
diff --git a/ext/mixed/js/dynamic-loader.js b/ext/mixed/js/dynamic-loader.js
new file mode 100644
index 00000000..20ed8454
--- /dev/null
+++ b/ext/mixed/js/dynamic-loader.js
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2020  Yomichan Authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+const dynamicLoader = (() => {
+    function loadStyles(urls) {
+        const parent = document.head;
+        for (const url of urls) {
+            const node = parent.querySelector(`link[href='${escapeCSSAttribute(url)}']`);
+            if (node !== null) { continue; }
+
+            const style = document.createElement('link');
+            style.rel = 'stylesheet';
+            style.type = 'text/css';
+            style.href = url;
+            parent.appendChild(style);
+        }
+    }
+
+    function loadScripts(urls) {
+        return new Promise((resolve) => {
+            const parent = document.body;
+            for (const url of urls) {
+                const node = parent.querySelector(`script[src='${escapeCSSAttribute(url)}']`);
+                if (node !== null) { continue; }
+
+                const script = document.createElement('script');
+                script.async = false;
+                script.src = url;
+                parent.appendChild(script);
+            }
+
+            loadScriptSentinel(resolve);
+        });
+    }
+
+    function loadScriptSentinel(resolve, reject) {
+        const script = document.createElement('script');
+
+        const sentinelEventName = 'dynamicLoaderSentinel';
+        const sentinelEventCallback = (e) => {
+            if (e.script !== script) { return; }
+            yomichan.off(sentinelEventName, sentinelEventCallback);
+            resolve();
+        };
+        yomichan.on(sentinelEventName, sentinelEventCallback);
+
+        try {
+            script.async = false;
+            script.src = '/mixed/js/dynamic-loader-sentinel.js';
+            document.body.appendChild(script);
+        } catch (e) {
+            yomichan.off(sentinelEventName, sentinelEventCallback);
+            reject(e);
+        }
+    }
+
+    function escapeCSSAttribute(value) {
+        return value.replace(/['\\]/g, (character) => `\\${character}`);
+    }
+
+
+    return {
+        loadStyles,
+        loadScripts
+    };
+})();

From 749b747728175d8a7d5638af2c6ec01102a282c1 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 22 Apr 2020 17:48:42 -0400
Subject: [PATCH 2/2] Remove sentinel script node after load

---
 ext/mixed/js/dynamic-loader.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/mixed/js/dynamic-loader.js b/ext/mixed/js/dynamic-loader.js
index 20ed8454..29672d36 100644
--- a/ext/mixed/js/dynamic-loader.js
+++ b/ext/mixed/js/dynamic-loader.js
@@ -48,12 +48,14 @@ const dynamicLoader = (() => {
     }
 
     function loadScriptSentinel(resolve, reject) {
+        const parent = document.body;
         const script = document.createElement('script');
 
         const sentinelEventName = 'dynamicLoaderSentinel';
         const sentinelEventCallback = (e) => {
             if (e.script !== script) { return; }
             yomichan.off(sentinelEventName, sentinelEventCallback);
+            parent.removeChild(script);
             resolve();
         };
         yomichan.on(sentinelEventName, sentinelEventCallback);
@@ -61,7 +63,7 @@ const dynamicLoader = (() => {
         try {
             script.async = false;
             script.src = '/mixed/js/dynamic-loader-sentinel.js';
-            document.body.appendChild(script);
+            parent.appendChild(script);
         } catch (e) {
             yomichan.off(sentinelEventName, sentinelEventCallback);
             reject(e);