From 0dc44cbbb632eaf7c2e689a83125f012586dda80 Mon Sep 17 00:00:00 2001
From: wearrrrr <rowancole19@gmail.com>
Date: Wed, 7 Feb 2024 09:43:38 -0600
Subject: [PATCH] Fixed regression and removed hack.

---
 .../SettingsContent/CreditsTab.astro          | 24 +++++++++++++++----
 src/components/UVRegistrar.astro              | 20 +++++++---------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/components/SettingsContent/CreditsTab.astro b/src/components/SettingsContent/CreditsTab.astro
index 8b71074..fd349ad 100644
--- a/src/components/SettingsContent/CreditsTab.astro
+++ b/src/components/SettingsContent/CreditsTab.astro
@@ -7,16 +7,32 @@ const t = useTranslations(lang);
 <div class="settings-container">
   <div class="credits-container">
     <p class="credit-item">
-      {t("ultraviolet")} - <a target="_blank" rel="noreferrer noopener" href="https://titaniumnetwork.org/">Titanium Network</a>
+      {t("ultraviolet")} - <a
+        target="_blank"
+        rel="noreferrer noopener"
+        href="https://titaniumnetwork.org/">Titanium Network</a
+      >
     </p>
     <p class="credit-item">
-      {t("settings.credits.japaneseTranslations")} - <a target="_blank" rel="noreferrer noopener" href="https://wearr.dev">wearr</a>
+      {t("settings.credits.japaneseTranslations")} - <a
+        target="_blank"
+        rel="noreferrer noopener"
+        href="https://wearr.dev">wearr</a
+      >
     </p>
     <p class="credit-item">
-      {t("settings.credits.mochaandmacchiatothemes")} - <a target="_blank" rel="noreferrer noopener" href="https://github.com/catppuccin/catppuccin">Catppuccin</a>
+      {t("settings.credits.mochaandmacchiatothemes")} - <a
+        target="_blank"
+        rel="noreferrer noopener"
+        href="https://github.com/catppuccin/catppuccin">Catppuccin</a
+      >
     </p>
     <p class="credit-item">
-      Rosé Pine Theme - <a target="_blank" rel="noreferrer noopener" href="https://rosepinetheme.com/">Rosé Pine</a>
+      Rosé Pine Theme - <a
+        target="_blank"
+        rel="noreferrer noopener"
+        href="https://rosepinetheme.com/">Rosé Pine</a
+      >
     </p>
   </div>
 </div>
diff --git a/src/components/UVRegistrar.astro b/src/components/UVRegistrar.astro
index 234cb54..cc60c28 100644
--- a/src/components/UVRegistrar.astro
+++ b/src/components/UVRegistrar.astro
@@ -1,23 +1,23 @@
 <script src="/uv/uv.bundle.js" transition:persist></script>
 <script src="/uv.config.js" transition:persist></script>
-<script transition:persist>
+<script is:inline>
   let form = document.querySelector("form");
   let input = document.querySelector("input");
   window.navigator.serviceWorker.register("/sw.js", {
     scope: window.__uv$config.prefix,
   });
+  document.addEventListener("astro:after-swap", initForm);
+  function initForm() {
+    let formEle = document.querySelector("form");
+    input = document.querySelector("input");
+    if (formEle) formEle.addEventListener("submit", formEventListener);
+  }
   if (form) {
-    document.addEventListener("astro:after-swap", () => {
-      form = document.querySelector("form");
-      input = document.querySelector("input");
-      if (form) {
-        form.addEventListener("submit", formEventListener);
-      }
-
-    });
     form.addEventListener("submit", formEventListener);
+  }
 
   function formEventListener(event) {
+    console.log("Form event listener");
     event.preventDefault();
     let loadingContent = document.getElementById("loading-content");
     loadingContent.style.opacity = 1;
@@ -55,8 +55,6 @@
       document.body.appendChild(topBar);
     });
   }
-  }
-
 
   function isUrl(val = "") {
     if (/^http(s?):\/\//.test(val) || (val.includes(".") && val.substr(0, 1) !== " ")) return true;