Fixing issue #21

search query isn't sent to the server now until AFTER the list of instances is returned.
marsara9 · Jul 4, 2023 · 86ac329 · 86ac329
1 parent 714bccc
commit 86ac329
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 44 deletions.
diff --git a/ui/main.js b/ui/main.js
@@ -1,21 +1,5 @@
 
 
 $(document).ready(function() {
-    $("#submit").click(function() {
-        onSearch();
-    });
-
-    $("#search").keydown(function(e){
-        if(e.keyCode == 13) {
-            onSearch();
-        }
-    });
-
-    $("#instance-select").on("change", function() {
-        preferred_instance = this.value;
-        setCookie("preferred-instance", preferred_instance);
-    });
-
-    getVersion();
-    populateInstances();
+
 });
diff --git a/ui/results/results.js b/ui/results/results.js
@@ -192,31 +192,6 @@ function isImage(url) {
     return /\.(jpg|jpeg|png|webp|avif|gif|svg)$/.test(url);
 }
 
-$(document).ready(function() {
-
-    if (!checkQueryParameters()) {
-        window.location = "/";
-        return;
-    }
-
-    $("#submit").click(function() {
-        onSearch();
-    });
-
-    $("#search").keydown(function(e){
-        if(e.keyCode == 13) {
-            onSearch();
-        }
-    });
-
-
-    $("#instance-select").on("change", function() {
-        preferred_instance = this.value;
-        setCookie("preferred-instance", preferred_instance);
-    });
-
-    getVersion();
-    populateInstances();
-
+function onReady() {
     query(window.location.search);
-});
+}
diff --git a/ui/shared/common.js b/ui/shared/common.js
@@ -53,3 +53,35 @@ function getVersion() {
         $("#version").text(result.version);
     });
 }
+
+function initializeUI() {
+    $("#submit").click(function() {
+        onSearch();
+    });
+
+    $("#search").keydown(function(e){
+        if(e.keyCode == 13) {
+            onSearch();
+        }
+    });
+
+    $("#instance-select").on("change", function() {
+        preferred_instance = this.value;
+        setCookie("preferred-instance", preferred_instance, 3652);
+    });
+}
+
+function populateInitialFields() {
+    getVersion();
+    populateInstances();
+}
+
+$(document).ready(function() {
+    initializeUI();
+
+    populateInitialFields();
+
+    if(onReady) {
+        onReady();
+    }
+});