From: Aaron Lidman Date: Thu, 14 Nov 2013 17:57:48 +0000 (-0800) Subject: Fixed note creation halo to update on dragging X-Git-Tag: live~4625^2~71 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2ce7060757ecfe242ddcb045084551b6bde21368 Fixed note creation halo to update on dragging --- diff --git a/app/assets/javascripts/index/new_note.js.erb b/app/assets/javascripts/index/new_note.js.erb index 4c728d2f5..95e38b2d3 100644 --- a/app/assets/javascripts/index/new_note.js.erb +++ b/app/assets/javascripts/index/new_note.js.erb @@ -80,6 +80,23 @@ OSM.NewNote = function(map) { OSM.loadSidebarContent(path, page.load); }; + function newHalo(loc, a) { + if (a == 'dragstart' && map.hasLayer(halo)) { + map.removeLayer(halo); + } else { + if (map.hasLayer(halo)) map.removeLayer(halo); + + halo = L.circleMarker(loc, { + weight: 2.5, + radius: 20, + fillOpacity: 0.5, + color: "#FF6200" + }); + + map.addLayer(halo); + } + } + page.load = function () { if (addNoteButton.hasClass("disabled")) return; if (addNoteButton.hasClass("active")) return; @@ -105,16 +122,13 @@ OSM.NewNote = function(map) { draggable: true }); - newNote.addTo(noteLayer); - - halo = L.circleMarker(map.containerPointToLatLng(markerPosition), { - weight: 2.5, - radius: 20, - fillOpacity: 0.5, - color: "#FF6200" + newNote.on("dragstart dragend", function(a) { + console.log(a); + newHalo(newNote.getLatLng(), a.type); }); - map.addLayer(halo); + newNote.addTo(noteLayer); + newHalo(newNote.getLatLng()); newNote.on("remove", function () { addNoteButton.removeClass("active");