cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove fallback code for undefined history.pushState()

Browse source
This commit is contained in:
Anton Khorev 2022-12-07 10:57:30 +03:00
parent 9273f7d4a7
commit 31ca37a1d0
1 changed files with 34 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

78
app/assets/javascripts/router.js
View file

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