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

Don't enable query mode when loading a query URL

Browse source
This commit is contained in:
Tom Hughes 2014-11-05 20:19:21 +00:00
parent e78ab8d0d6
commit 6b09732854
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/index/query.js
View file

@ -317,11 +317,12 @@ OSM.Query = function(map) {
}
queryOverpass(params.lat, params.lon);
enableQueryMode();
};
page.unload = function() {
disableQueryMode();
page.unload = function(sameController) {
if (!sameController) {
disableQueryMode();
}
};
return page;

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

@ -76,6 +76,8 @@ OSM.Router = function(map, rts) {
});
}
params = params.concat(Array.prototype.slice.call(arguments, 2));
return (controller[action] || $.noop).apply(controller, params);
};
@ -101,11 +103,12 @@ OSM.Router = function(map, rts) {
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;
var path = window.location.pathname + window.location.search,
route = routes.recognize(path);
if (path === currentPath) return;
currentRoute.run('unload');
currentRoute.run('unload', null, route === currentRoute);
currentPath = path;
currentRoute = routes.recognize(currentPath);
currentRoute = route;
currentRoute.run('popstate', currentPath);
map.setState(e.originalEvent.state, {animate: false});
});
@ -114,7 +117,7 @@ OSM.Router = function(map, rts) {
var path = url.replace(/#.*/, ''),
route = routes.recognize(path);
if (!route) return false;
currentRoute.run('unload');
currentRoute.run('unload', null, route === currentRoute);
var state = OSM.parseHash(url);
map.setState(state);
window.history.pushState(state, document.title, url);