X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/68a3df4d53c84508bf443058040379c3a18eb1a7..248d0b863cde44881574ef01b974afeb2cad12e9:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 3ce1a02da..1cbd97f86 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -46,7 +46,8 @@ var content = $(xhr.responseText); if (xhr.getResponseHeader('X-Page-Title')) { - document.title = xhr.getResponseHeader('X-Page-Title'); + var title = xhr.getResponseHeader('X-Page-Title'); + document.title = decodeURIComponent(escape(title)); } $('head') @@ -235,16 +236,16 @@ $(document).ready(function () { return page; }; - OSM.Browse = function(map) { + OSM.Browse = function(map, type) { var page = {}; - page.pushstate = page.popstate = function(path, type, id) { + page.pushstate = page.popstate = function(path, id) { OSM.loadSidebarContent(path, function() { - page.load(path, type, id); + page.load(path, id); }); }; - page.load = function(path, type, id) { + page.load = function(path, id) { map.addObject({type: type, id: parseInt(id)}); }; @@ -266,8 +267,11 @@ $(document).ready(function () { "/history/nearby": history, "/history": history, "/user/:display_name/history": history, - "/note/:id": OSM.Note(map), - "/:type/:id(/history)": OSM.Browse(map) + "/note/:id": OSM.Note(map), + "/node/:id(/history)": OSM.Browse(map, 'node'), + "/way/:id(/history)": OSM.Browse(map, 'way'), + "/relation/:id(/history)": OSM.Browse(map, 'relation'), + "/changeset/:id": OSM.Browse(map, 'changeset') }); OSM.router.load();