X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..839d203d5121482e9bcd998749d410f541ce2f51:/app/assets/javascripts/router.js?ds=sidebyside diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js index c397a44ec..d890f38a4 100644 --- a/app/assets/javascripts/router.js +++ b/app/assets/javascripts/router.js @@ -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);