static/js/fixedsearch: Avoid search conflict

Add some guards

2 files changed, 23 insertions, 15 deletions

diff --git a/assets/js/index.js b/assets/js/index.js
index f417396..176959d 100644
--- a/assets/js/index.js
+++ b/assets/js/index.js
@@ -542,24 +542,32 @@
             function initialize() {
                 if (boot) {
                     script(window.location.origin + "/js/fuzzysort.js").then(function() {
-                        boot = false;
                         fetch("/index.json", function(request) {
                             appendItemsTo({}, JSON.parse(request.responseText));
+                            search(query.value, data.items, options);
+                            boot = false;
                         });
                         const options = {
                             key: [
                                 "title"
                             ]
                         };
-                        query.addEventListener("keyup", function() {
-                            search(query.value, data.items, options);
-                        });
-                        query.addEventListener("focusin", function() {
-                            search(query.value, data.items, options);
+                        [
+                            "keyup",
+                            "focusin"
+                        ].forEach(function(event) {
+                            query.addEventListener(event, function() {
+                                if (data.items) search(query.value, data.items, options);
+                                else {
+                                    boot = true;
+                                    initialize();
+                                }
+                            });
                         });
-                        search(query.value, data.items, options);
                     }).catch(function(error) {
                         console.error("ERROR: Failed to load fuzzy search", error);
+                        boot = true;
+                        initialize();
                     });
                 }
             }
diff --git a/static/js/fixedsearch.ts b/static/js/fixedsearch.ts
index 1e44601..6d91dfe 100644
--- a/static/js/fixedsearch.ts
+++ b/static/js/fixedsearch.ts
@@ -193,25 +193,25 @@
       if (boot) {
         script(window.location.origin + "/js/fuzzysort.js")
           .then(function () {
-            boot = false;
 
             fetch("/index.json", function (request) {
               appendItemsTo({}, JSON.parse(request.responseText));
+              search(query.value, data.items, options);
+              boot = false;
             });
 
             const options = { key: ["title"] };
 
-            query.addEventListener("keyup", function () {
-              search(query.value, data.items, options);
-            });
-
-            query.addEventListener("focusin", function () {
-              search(query.value, data.items, options);
+            ["keyup", "focusin"].forEach(function (event) {
+              query.addEventListener(event, function () {
+                if (data.items) search(query.value, data.items, options);
+                else { boot = true; initialize(); }
+              });
             });
 
-            search(query.value, data.items, options);
           }).catch(function (error) {
             console.error("ERROR: Failed to load fuzzy search", error);
+            boot = true; initialize();
           });
       }
     }