X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8fb3d7365fb91d1822ae5f37361af077d48a9c8c..853dc286b9c9093d0c1ad2082671111316703e4f:/app/assets/javascripts/index/new_note.js.erb diff --git a/app/assets/javascripts/index/new_note.js.erb b/app/assets/javascripts/index/new_note.js.erb index e544c1a93..c47cb563c 100644 --- a/app/assets/javascripts/index/new_note.js.erb +++ b/app/assets/javascripts/index/new_note.js.erb @@ -23,10 +23,6 @@ OSM.NewNote = function(map) { }) }; - page.pushstate = page.popstate = function () { - page.load(); - }; - addNoteButton.on("click", function (e) { e.preventDefault(); e.stopPropagation(); @@ -67,7 +63,7 @@ OSM.NewNote = function(map) { } function updateMarker(feature) { - marker = L.marker(feature.geometry.coordinates.reverse(), { + var marker = L.marker(feature.geometry.coordinates.reverse(), { icon: noteIcons[feature.properties.status], opacity: 0.9, clickable: true @@ -77,7 +73,11 @@ OSM.NewNote = function(map) { return marker; } - function initialize() { + page.pushstate = page.popstate = function (path) { + OSM.loadSidebarContent(path, page.load); + }; + + page.load = function () { if (addNoteButton.hasClass("disabled")) return; if (addNoteButton.hasClass("active")) return; @@ -124,15 +124,6 @@ OSM.NewNote = function(map) { e.preventDefault(); createNote(newNote, e.target.form, '/api/0.6/notes.json'); }); - } - - page.load = function () { - content.load(window.location.pathname + "?xhr=1", function (a, b, xhr) { - if (xhr.getResponseHeader('X-Page-Title')) { - document.title = xhr.getResponseHeader('X-Page-Title'); - } - initialize(); - }); }; page.unload = function () {