From 82e4d36b144499ba6c026ca6b28d911c5e97bac9 Mon Sep 17 00:00:00 2001
From: remi <remilia@remilia.se>
Date: Sun, 19 Jun 2022 11:35:33 +0200
Subject: [PATCH] fix funny html bug

---
 main.js | 28 +++++++++++++++++-----------
 sw.js   |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/main.js b/main.js
index 4ae9c2b..e3bf134 100644
--- a/main.js
+++ b/main.js
@@ -371,13 +371,15 @@ function doSearch(state = true) {
                 } else {
                     types[json[results[i]][o]["type"]]++;
                 }
-                //number, meaning (*required)
-                meaning.innerHTML += "<span class='result-number'>" + (o + 1) + "</span><span class='result-big'>" + json[results[i]][o]["meaning"] + "</span>";
-                //longer translation (below are not required, make sure to check for them)
-                if (json[results[i]][o]["translation"] != undefined) {
-                    if (json[results[i]][o]["meaning"] != undefined && json[results[i]][o]["translation"].toLowerCase() != json[results[i]][o]["meaning"].toLowerCase()) {
+                //meaning, tl, etc
+                if (json[results[i]][o]["meaning"] != undefined) {
+                    meaning.innerHTML += "<span class='result-number'>" + (o + 1) + "</span><span class='result-big'>" + escapeHTML(json[results[i]][o]["meaning"]) + "</span>";
+                } else if (json[results[i]][o]["translation"] != undefined) {
+                    meaning.innerHTML += "<span class='result-number'>" + (o + 1) + "</span><span class='result-big'>" + escapeHTML(json[results[i]][o]["translation"]) + "</span>";
+                }
+                if (json[results[i]][o]["translation"] != undefined && json[results[i]][o]["meaning"] != undefined) {
+                    if (json[results[i]][o]["translation"].toLowerCase() != json[results[i]][o]["meaning"].toLowerCase())
                         meaning.innerHTML += "<br><span class='result-translation'>" + json[results[i]][o]["translation"] + "</span>";
-                    }
                 }
                 //example
                 if (json[results[i]][o]["examples"] != undefined) {
@@ -428,14 +430,14 @@ function doSearch(state = true) {
                 }
                 //notes
                 if (json[results[i]][o]["notes"] != undefined) {
-                    meaning.innerHTML += "<p class='result-notes'>" + json[results[i]][o]["notes"] + "</p>";
+                    meaning.innerHTML += "<p class='result-notes'>" + escapeHTML(json[results[i]][o]["notes"]) + "</p>";
                 }
                 //(source, etc)
                 if (json[results[i]][o]["canon-etymology"] != undefined) {
-                    meaning.innerHTML += "<details class='result-meta'><summary>Canon Etymology</summary><p>" + json[results[i]][o]["canon-etymology"] + "</p></details>";
+                    meaning.innerHTML += "<details class='result-meta'><summary>Canon Etymology</summary><p>" + escapeHTML(json[results[i]][o]["canon-etymology"]) + "</p></details>";
                 }
                 if (json[results[i]][o]["meta-etymology"] != undefined) {
-                    meaning.innerHTML += "<details class='result-meta'><summary>Meta Etymology</summary><p>" + json[results[i]][o]["meta-etymology"] + "</p></details>";
+                    meaning.innerHTML += "<details class='result-meta'><summary>Meta Etymology</summary><p>" + escapeHTML(json[results[i]][o]["meta-etymology"]) + "</p></details>";
                 }
                 //todo
                 result.appendChild(meaning); //y, yeah.
@@ -518,9 +520,13 @@ function removeSW() {
             caches.delete(name);
     }); //this doesnt actually seem to work :/ but . i'll leave it in for later fixing
     navigator.serviceWorker.getRegistrations().then(function(registrations) {
-        for (let registration of registrations) {
+        for (let registration of registrations) 
             registration.unregister();
-    }}); //dev use only!! or whatever... i just copypasted this from SO
+    }); //dev use only!! or whatever... i just copypasted this from SO
+}
+
+function escapeHTML(str){
+    return new Option(str).innerHTML;
 }
 
 window.onload = () => {
diff --git a/sw.js b/sw.js
index f7743f7..2fb56c4 100644
--- a/sw.js
+++ b/sw.js
@@ -1,4 +1,4 @@
-const currentVersion = '2909';
+const currentVersion = '20945';
 
 const addResourcesToCache = async (resources) => {
     const cache = await caches.open(currentVersion);