]> git.openstreetmap.org Git - rails.git/commitdiff
Remove fallback code for undefined history.pushState()
authorAnton Khorev <tony29@yandex.ru>
Wed, 7 Dec 2022 07:57:30 +0000 (10:57 +0300)
committerAnton Khorev <tony29@yandex.ru>
Wed, 7 Dec 2022 07:57:30 +0000 (10:57 +0300)
app/assets/javascripts/router.js

index c397a44ec4de3eeeb0e338aceaeca557f3a6865c..d890f38a480a384d6edd5570e384f71916cc30bc 100644 (file)
@@ -101,53 +101,43 @@ OSM.Router = function (map, rts) {
 
   var router = {};
 
-  if (window.history && window.history.pushState) {
-    $(window).on("popstate", function (e) {
-      if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change?
-      var path = window.location.pathname + window.location.search,
-          route = routes.recognize(path);
-      if (path === currentPath) return;
-      currentRoute.run("unload", null, route === currentRoute);
-      currentPath = path;
-      currentRoute = route;
-      currentRoute.run("popstate", currentPath);
-      map.setState(e.originalEvent.state, { animate: false });
-    });
-
-    router.route = function (url) {
-      var path = url.replace(/#.*/, ""),
-          route = routes.recognize(path);
-      if (!route) return false;
-      currentRoute.run("unload", null, route === currentRoute);
-      var state = OSM.parseHash(url);
-      map.setState(state);
-      window.history.pushState(state, document.title, url);
-      currentPath = path;
-      currentRoute = route;
-      currentRoute.run("pushstate", currentPath);
-      return true;
-    };
-
-    router.replace = function (url) {
-      window.history.replaceState(OSM.parseHash(url), document.title, url);
-    };
+  $(window).on("popstate", function (e) {
+    if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change?
+    var path = window.location.pathname + window.location.search,
+        route = routes.recognize(path);
+    if (path === currentPath) return;
+    currentRoute.run("unload", null, route === currentRoute);
+    currentPath = path;
+    currentRoute = route;
+    currentRoute.run("popstate", currentPath);
+    map.setState(e.originalEvent.state, { animate: false });
+  });
+
+  router.route = function (url) {
+    var path = url.replace(/#.*/, ""),
+        route = routes.recognize(path);
+    if (!route) return false;
+    currentRoute.run("unload", null, route === currentRoute);
+    var state = OSM.parseHash(url);
+    map.setState(state);
+    window.history.pushState(state, document.title, url);
+    currentPath = path;
+    currentRoute = route;
+    currentRoute.run("pushstate", currentPath);
+    return true;
+  };
 
-    router.stateChange = function (state) {
-      if (state.center) {
-        window.history.replaceState(state, document.title, OSM.formatHash(state));
-      } else {
-        window.history.replaceState(state, document.title, window.location);
-      }
-    };
-  } else {
-    router.route = router.replace = function (url) {
-      window.location.assign(url);
-    };
+  router.replace = function (url) {
+    window.history.replaceState(OSM.parseHash(url), document.title, url);
+  };
 
-    router.stateChange = function (state) {
-      if (state.center) window.location.replace(OSM.formatHash(state));
-    };
-  }
+  router.stateChange = function (state) {
+    if (state.center) {
+      window.history.replaceState(state, document.title, OSM.formatHash(state));
+    } else {
+      window.history.replaceState(state, document.title, window.location);
+    }
+  };
 
   router.updateHash = function () {
     var hash = OSM.formatHash(map);