restructure jbo import, themes

mi2ebi · Jan 22, 2024 · 1718569 · 1718569
1 parent 4fa8582
commit 1718569
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 30 deletions.
diff --git a/events.js b/events.js
@@ -1,4 +1,4 @@
-const worker = new Worker("worker.js", {"type": "module"});
+var worker = {"postMessage": function(a) {console.log("no");}};
 var config = {};
 let page;
 var q = "";
@@ -25,14 +25,6 @@ function getConflictRegex(g) {
     conflict = "(" + conflict.join("|").replace(/\|+/, "|") + ")";
     return conflict;
 }
-worker.addEventListener("message", function(e) {
-    results = e.data;
-    id("results").innerHTML = "";
-    id("length").innerHTML = results.length + " result" + (results.length == 1 ? "" : "s");
-    page = 0;
-    load(results, page);
-    checkLength();
-});
 window.addEventListener("scroll", function(e) {
     if (window.innerHeight + window.scrollY >= document.body.scrollHeight - 100) {
         page++;
@@ -125,7 +117,7 @@ id("search").addEventListener("input", function() {
                     id("info").append(createHTMLElement("p", null, [e.message.split(": ").slice(-1)[0].toLowerCase()]));
                 }
             }
-            worker.postMessage({"query": q, "config": config, "rafsilist": RAFSI});
+            worker.postMessage({"query": q, "config": config, "rafsilist": RAFSI, "jbo": jbo});
         } else {
             results = null;
             clearResults();
@@ -210,23 +202,6 @@ id("clear").addEventListener("click", function() {
     id("search").value = "";
     dispatchSearchInputEvent();
 });
-// theme (mi lebna ti la lalxu)
-function setTheme(dark) {
-    document.documentElement.className = dark ? "dark" : "";
-    try {
-        localStorage.setItem("theme", dark ? "dark" : "light");
-    } catch (e) {
-        //
-    }
-}
-var theme = window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)") ? "dark" : "light";
-try {
-    theme = localStorage.getItem("theme") || theme;
-} catch (e) {
-    //
-}
-setTheme(theme == "dark");
-setTimeout(() => {document.body.style.transition = "background 0.2s"}, 0);
 id("theme").addEventListener("click", function() {
     setTheme(document.documentElement.className != "dark");
 });
diff --git a/index.html b/index.html
@@ -66,10 +66,39 @@ <h1>la xlasisku</h1>
         <div id="length"></div>
         <div id="results"></div>
         <div id="bottom"></div>
+        <script>
+            // theme (mi lebna ti la lalxu)
+            function setTheme(dark) {
+                document.documentElement.className = dark ? "dark" : "";
+                try {
+                    localStorage.setItem("theme", dark ? "dark" : "light");
+                } catch (e) {
+                    //
+                }
+            }
+            var theme = window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)") ? "dark" : "light";
+            try {
+                theme = localStorage.getItem("theme") || theme;
+            } catch (e) {
+                //
+            }
+            setTheme(theme == "dark");
+            setTimeout(() => {document.body.style.transition = "background 0.2s"}, 0);
+        </script>
         <script src="helper.js"></script>
+        <script src="data/jbo.js"></script>
         <script src="events.js"></script>
         <script>
             // ready for stuff to happen
+            worker = new Worker("worker.js", {"type": "module"});
+            worker.addEventListener("message", function(e) {
+                results = e.data;
+                id("results").innerHTML = "";
+                id("length").innerHTML = results.length + " result" + (results.length == 1 ? "" : "s");
+                page = 0;
+                load(results, page);
+                checkLength();
+            });
             id("sm").removeAttribute("disabled");
             id("rm").removeAttribute("disabled");
             id("xm").removeAttribute("disabled");

diff --git a/style.css b/style.css
@@ -68,7 +68,7 @@
     --link: 0, 105, 204;
     --err: 209, 41, 41;
     --focus: 255, 174, 12;
-    --sans: "IBM Plex Sans", ui-sans-serif, sans-serif;
+    --sans: "Noto Sans", "Noto Sans Math", ui-sans-serif, sans-serif;
     --mono: "Iosevka", ui-monospace, monospace;
 }
 body.regex {

diff --git a/worker.js b/worker.js
@@ -1,5 +1,4 @@
-import {jbo} from "./data/jbo.js";
-var config, rafsilist;
+var config, rafsilist, jbo;
 function h(t) {
     return t.replace(/[h‘’]/igu, "'");
 }
@@ -102,6 +101,7 @@ onmessage = function(e) {
     const query = e.data.query;
     config = e.data.config;
     rafsilist = e.data.rafsilist;
+    jbo = e.data.jbo;
     const res = search(query);
     postMessage(res);
 };