From 29f6c6fc4091fd5f45923dbb30952331fb642051 Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Sun, 19 Jul 2026 15:59:40 +0200
Subject: [PATCH] Destructure popstate listener event

---
 app/assets/javascripts/router.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index 3f7fe4d9b..77c726789 100644
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -125,12 +125,12 @@ OSM.Router = function (map, rts) {
     return routingInProgress;
   }
 
-  $(window).on("popstate", function (e) {
-    if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change?
+  addEventListener("popstate", function ({ state }) {
+    if (!state) return; // Is it a real popstate event or just a hash change?
     const path = location.pathname + location.search;
     if (path === currentPath) return;
     const done = transition(path);
-    if (done) done.then(() => map.setState(e.originalEvent.state, { animate: false }));
+    if (done) done.then(() => map.setState(state, { animate: false }));
   });
 
   router.route = function (url) {
-- 
2.47.3