static/js/fixedsearch: Remove leak

Check filter location

3 files changed, 43 insertions, 39 deletions

diff --git a/assets/js/index.js b/assets/js/index.js
index 7408b49..694faa1 100644
--- a/assets/js/index.js
+++ b/assets/js/index.js
@@ -385,22 +385,24 @@
                     }
                 }
             });
-            let scrolls = 0;
-            self.addEventListener("scroll", function() {
-                if (scrolls > 3) {
-                    scrolls = 0;
-                    document.activeElement.blur();
-                    dropdown.setAttribute("hidden", "");
-                    container.removeAttribute("data-focus");
-                }
-                scrolls++;
-            });
-            self.addEventListener("click", function(event) {
-                if (!form.contains(event.target) && !(document.activeElement === query) && !(document.activeElement === submit)) {
-                    dropdown.setAttribute("hidden", "");
-                    container.removeAttribute("data-focus");
-                }
-            });
+            if (event === "DOMContentLoaded") {
+                let scrolls = 0;
+                self.addEventListener("scroll", function() {
+                    if (scrolls > 3) {
+                        scrolls = 0;
+                        document.activeElement.blur();
+                        dropdown.setAttribute("hidden", "");
+                        container.removeAttribute("data-focus");
+                    }
+                    scrolls++;
+                });
+                self.addEventListener("click", function(event) {
+                    if (!form.contains(event.target) && !(document.activeElement === query) && !(document.activeElement === submit)) {
+                        dropdown.setAttribute("hidden", "");
+                        container.removeAttribute("data-focus");
+                    }
+                });
+            }
             function fetch(url, callback) {
                 const http = new XMLHttpRequest();
                 http.onreadystatechange = function() {
@@ -756,7 +758,7 @@
         persist();
     });
     self.addEventListener("popstate", function(event) {
-        if (localStorage[key] !== state) return;
+        if (localStorage[key] !== state || !document.querySelector('link[rel="location"]')) return;
         const link = JSON.parse(document.querySelector('link[rel="location"]').target);
         const url = event.target.location;
         const hashed = link.pathname === url.pathname;
diff --git a/static/js/domfilter.ts b/static/js/domfilter.ts
index c972bf1..2be690d 100644
--- a/static/js/domfilter.ts
+++ b/static/js/domfilter.ts
@@ -95,7 +95,7 @@
   });
 
   self.addEventListener("popstate", function (event) {
-    if (localStorage[key] !== state) return;
+    if (localStorage[key] !== state || !document.querySelector('link[rel="location"]')) return;
     const link = JSON.parse(document.querySelector('link[rel="location"]').target);
     const url = event.target.location;
     const hashed = link.pathname === url.pathname;
diff --git a/static/js/fixedsearch.ts b/static/js/fixedsearch.ts
index 04d318b..54916aa 100644
--- a/static/js/fixedsearch.ts
+++ b/static/js/fixedsearch.ts
@@ -121,28 +121,30 @@
       }
     });
 
-    let scrolls = 0;
-
-    self.addEventListener("scroll", function () {
-      if (scrolls > 3) {
-        scrolls = 0;
-        document.activeElement.blur();
-        dropdown.setAttribute("hidden", "");
-        container.removeAttribute("data-focus");
-      }
-      scrolls++;
-    });
+    if (event === "DOMContentLoaded") {
+      let scrolls = 0;
 
-    self.addEventListener("click", function (event) {
-      if (
-        !form.contains(event.target) &&
-        !(document.activeElement === query) &&
-        !(document.activeElement === submit)
-      ) {
-        dropdown.setAttribute("hidden", "");
-        container.removeAttribute("data-focus");
-      }
-    });
+      self.addEventListener("scroll", function () {
+        if (scrolls > 3) {
+          scrolls = 0;
+          document.activeElement.blur();
+          dropdown.setAttribute("hidden", "");
+          container.removeAttribute("data-focus");
+        }
+        scrolls++;
+      });
+
+      self.addEventListener("click", function (event) {
+        if (
+          !form.contains(event.target) &&
+          !(document.activeElement === query) &&
+          !(document.activeElement === submit)
+        ) {
+          dropdown.setAttribute("hidden", "");
+          container.removeAttribute("data-focus");
+        }
+      });
+    }
 
     function fetch(url, callback) {
       const http = new XMLHttpRequest();