X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1b19974b1209fdab6f35168290251572ca86f142..baf10cd39289cd7e94a819305e46f43e85a136c6:/app/assets/javascripts/index/notes.js.erb diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb index c3169ca09..4e45cbe05 100644 --- a/app/assets/javascripts/index/notes.js.erb +++ b/app/assets/javascripts/index/notes.js.erb @@ -1,7 +1,6 @@ function initializeNotes(map) { var noteLayer = map.noteLayer, - notes = {}, - newNote; + notes = {}; var noteIcons = { "new": L.icon({ @@ -32,18 +31,13 @@ function initializeNotes(map) { noteLayer.clearLayers(); notes = {}; } - }).on("popupclose", function (e) { - if (newNote && e.popup == newNote._popup) { - $(newNote).oneTime(10, "removenote", function () { - map.removeLayer(newNote); - newNote = null; - }); - } - }) + }); noteLayer.on('click', function(e) { - OSM.route('/browse/note/' + e.layer.id); - }) + if (e.layer.id) { + OSM.router.route('/note/' + e.layer.id); + } + }); function updateMarker(marker, feature) { if (marker) { @@ -51,7 +45,7 @@ function initializeNotes(map) { } else { marker = L.marker(feature.geometry.coordinates.reverse(), { icon: noteIcons[feature.properties.status], - opacity: 0.9, + opacity: 0.8, clickable: true }); marker.id = feature.properties.id; @@ -92,11 +86,11 @@ function initializeNotes(map) { notes[feature.properties.id] = updateMarker(marker, feature); } - for (id in oldNotes) { + for (var id in oldNotes) { noteLayer.removeLayer(oldNotes[id]); } noteLoader = null; } - }; + } }