Migrate js to script and make input required

everywall · Dec 8, 2023 · dc82db8 · dc82db8
1 parent c870cd6
commit dc82db8
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 59 deletions.
diff --git a/handlers/form.html b/handlers/form.html
@@ -210,6 +210,7 @@
             class="w-full text-sm leading-6 text-slate-400 rounded-md ring-1 ring-slate-900/10 shadow-sm py-1.5 pl-2 pr-3 hover:ring-slate-300 dark:bg-slate-800 dark:highlight-white/5 dark:hover:bg-slate-700"
             autocomplete="off"
             autofocus
+            required
           />
           <button
             id="clearButton"
@@ -233,10 +234,6 @@
               <path d="m6 6 12 12" />
             </svg>
           </button>
-          <p
-            id="errorContainer"
-            class="absolute ml-2 left-0 -bottom-6 text-red-700 dark:text-red-400 text-sm"
-          />
         </div>
 
         <div
@@ -279,34 +276,12 @@
     <script>
       function validateAndRedirect(destination) {
         let url = inputField.value;
-        let error = "";
-        if (!url || typeof url !== "string") {
-          error = "Please enter a valid URL.";
-        }
-        if (typeof url === "string" && url.indexOf("http") === -1) {
-          url = "https://" + url;
-        }
-        const urlPattern = /^(https?:\/\/)?([\w.-]+)\.([a-z]{2,})(\/\S*)?$/i;
-        if (!urlPattern.test(url)) {
-          error = "Please enter a valid URL.";
-        }
-        if (error) {
-          errorContainer.textContent = error;
-          return false;
-        }
         const redirectUrl =
           destination === "outline" ? "/outline/" + url : "/" + url;
         window.location.href = redirectUrl;
         return true;
       }
 
-      function clearInput() {
-        inputField.value = "";
-        clearButton.style.display = "none";
-        errorContainer.textContent = "";
-        inputField.focus();
-      }
-
       document
         .getElementById("inputForm")
         .addEventListener("submit", function (e) {
@@ -319,33 +294,6 @@
         .addEventListener("click", function () {
           validateAndRedirect("outline");
         });
-
-      const inputField = document.getElementById("inputField");
-      const clearButton = document.getElementById("clearButton");
-      const errorContainer = document.getElementById("errorContainer");
-
-      if (inputField !== null && clearButton !== null) {
-        inputField.addEventListener("input", () => {
-          const clearButton = document.getElementById("clearButton");
-          if (clearButton !== null) {
-            if (inputField.value.trim().length > 0) {
-              clearButton.style.display = "block";
-            } else {
-              clearButton.style.display = "none";
-            }
-          }
-        });
-
-        inputField.addEventListener("keydown", (event) => {
-          if (event.code === "Escape") {
-            clearInput();
-          }
-        });
-
-        clearButton.addEventListener("click", () => {
-          clearInput();
-        });
-      }
     </script>
   </body>
 </html>
diff --git a/handlers/script.js b/handlers/script.js
@@ -1,8 +1,12 @@
 const labels = document.querySelectorAll("label");
 const inputs = document.querySelectorAll('input[type="radio"]');
 const mainElement = document.querySelector("main");
+const inputField = document.getElementById("inputField");
+const clearButton = document.getElementById("clearButton");
 
-const handleDOMContentLoaded = () => {
+window.addEventListener("DOMContentLoaded", handleDOMContentLoaded);
+
+function handleDOMContentLoaded() {
   handleFontChange();
   handleFontSizeChange();
   inputs.forEach((input) => {
@@ -12,7 +16,36 @@ const handleDOMContentLoaded = () => {
     }
   });
   window.removeEventListener("DOMContentLoaded", handleDOMContentLoaded);
-};
+}
+
+function clearInput() {
+  inputField.value = "";
+  clearButton.style.display = "none";
+  inputField.focus();
+}
+
+if (inputField !== null && clearButton !== null) {
+  inputField.addEventListener("input", () => {
+    const clearButton = document.getElementById("clearButton");
+    if (clearButton !== null) {
+      if (inputField.value.trim().length > 0) {
+        clearButton.style.display = "block";
+      } else {
+        clearButton.style.display = "none";
+      }
+    }
+  });
+
+  inputField.addEventListener("keydown", (event) => {
+    if (event.code === "Escape") {
+      clearInput();
+    }
+  });
+
+  clearButton.addEventListener("click", () => {
+    clearInput();
+  });
+}
 
 function focusable_children(node) {
   const nodes = Array.from(
@@ -95,7 +128,7 @@ const toggleDropdown = () => {
   };
 
   const handleClickOutside = (e) => {
-    if (!dropdown.contains(e.target)) {
+    if (dropdown !== null && !dropdown.contains(e.target)) {
       closeDropdown();
     }
   };
@@ -292,5 +325,3 @@ const handleFontSizeChange = () => {
     changeFontSize(node, classes);
   });
 };
-
-window.addEventListener("DOMContentLoaded", handleDOMContentLoaded);