X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f24309ad3e7b2a805f032afdef9765dc6d0bc022..653f7c0d74ba29a761865248728db7fd439a749e:/app/assets/javascripts/router.js diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js index 5b9cdad07..cbd418895 100644 --- a/app/assets/javascripts/router.js +++ b/app/assets/javascripts/router.js @@ -28,7 +28,7 @@ OSM.Router = function(map, rts) { }); } - (controller[action] || $.noop).apply(controller, params); + return (controller[action] || $.noop).apply(controller, params); }; return route; @@ -48,37 +48,9 @@ OSM.Router = function(map, rts) { currentRoute = routes.recognize(currentPath), currentHash = location.hash || OSM.formatHash(map); - currentRoute.run('load', currentPath); - - var stateChange; - - map.on('moveend baselayerchange overlaylayerchange', function() { - var hash = OSM.formatHash(map); - if (hash === currentHash) return; - currentHash = hash; - stateChange(OSM.parseHash(hash), hash); - }); - - $(window).on('hashchange', function() { - var hash = location.hash; - if (hash === currentHash) return; - currentHash = hash; - var state = OSM.parseHash(hash); - if (!state) return; - map.setView(state.center, state.zoom); - map.updateLayers(state.layers); - stateChange(state, hash); - }); + var router, stateChange; if (window.history && window.history.pushState) { - stateChange = function(state, hash) { - window.history.replaceState(state, document.title, hash); - }; - - // Set a non-null initial state, so that the e.originalEvent.state - // check below works correctly when going back to the initial page. - stateChange(OSM.parseHash(currentHash), currentPath + currentHash); - $(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; @@ -94,7 +66,7 @@ OSM.Router = function(map, rts) { } }); - return function (url) { + router = function (url) { var path = url.replace(/#.*/, ''), route = routes.recognize(path); if (!route) return false; @@ -104,14 +76,58 @@ OSM.Router = function(map, rts) { currentRoute = route; currentRoute.run('pushstate', currentPath); return true; - } - } else { - stateChange = function(state, hash) { - window.location.replace(hash); }; - return function (url) { + 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 = function (url) { window.location.assign(url); - } + }; + + router.stateChange = function(state) { + if (state.center) window.location.replace(OSM.formatHash(state)); + }; } + + router.updateHash = function() { + var hash = OSM.formatHash(map); + if (hash === currentHash) return; + currentHash = hash; + router.stateChange(OSM.parseHash(hash)); + }; + + router.hashUpdated = function() { + var hash = location.hash; + if (hash === currentHash) return; + currentHash = hash; + var state = OSM.parseHash(hash); + if (!state) return; + map.setView(state.center, state.zoom); + map.updateLayers(state.layers); + router.stateChange(state, hash); + }; + + router.moveListenerOn = function() { + map.on('moveend', router.updateHash); + }; + + router.moveListenerOff = function() { + map.off('moveend', router.updateHash); + }; + + router.load = function() { + var loadState = currentRoute.run('load', currentPath); + router.stateChange(loadState || {}); + }; + + map.on('moveend baselayerchange overlaylayerchange', router.updateHash); + $(window).on('hashchange', router.hashUpdated); + + return router; };