fix: register extra highlight language

Signed-off-by: Ryan Wang <[email protected]>
halo-dev · May 23, 2022 · 31e979a · 31e979a
1 parent 8f29547
commit 31e979a
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/module/highlightjs/scripts.ftl b/module/highlightjs/scripts.ftl
@@ -1,20 +1,31 @@
 <script>
-    const extraLanguages = "${settings.highlight_extra_languages!''}".split(",")
-    extraLanguages.forEach(function (lang) {
-        loadScript("${theme_base!}/assets/libs/highlight.js/languages/" + lang + ".min.js");
-    });
-    document.addEventListener('DOMContentLoaded', (event) => {
+    (async function () {
+        const extraLanguages = "${settings.highlight_extra_languages!''}".split(",").filter(x => x);
+
+        for (let i = 0; i < extraLanguages.length; i++) {
+            const lang = extraLanguages[i];
+            if (lang) {
+                await loadScript("${theme_base!}/assets/libs/highlight.js/languages/" + lang + ".min.js");
+            }
+        }
+
+        console.log("Extra languages: ", extraLanguages);
+
         document.querySelectorAll('pre code').forEach((el) => {
             hljs.highlightElement(el);
         });
-        console.log("Extra languages: ", extraLanguages)
         console.log("Loaded languages: ", hljs.listLanguages())
-    });
+    })()
 
     function loadScript(url) {
-        const script = document.createElement("script");
-        script.type = "text/javascript";
-        script.src = url;
-        document.getElementsByTagName("head")[0].appendChild(script);
+        return new Promise(function (resolve, reject) {
+            const script = document.createElement('script');
+            script.type = "text/javascript";
+            script.src = url;
+            script.onload = resolve;
+            script.onerror = reject;
+            document.head.appendChild(script);
+        });
     }
+
 </script>