X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a47c0a4411825f48e447641094678b15df3b2f74..ee4c34172f0a0145344525962cc5411a7f260ff5:/app/assets/javascripts/index/new_note.js diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js index 9bcaf2505..59fbeeb1d 100644 --- a/app/assets/javascripts/index/new_note.js +++ b/app/assets/javascripts/index/new_note.js @@ -1,3 +1,5 @@ +//= require qs/dist/qs + OSM.NewNote = function (map) { var noteLayer = map.noteLayer, content = $("#sidebar_content"), @@ -83,10 +85,12 @@ OSM.NewNote = function (map) { }; function newHalo(loc, a) { - if (a === "dragstart" && map.hasLayer(halo)) { + var hasHalo = halo && map.hasLayer(halo); + + if (a === "dragstart" && hasHalo) { map.removeLayer(halo); } else { - if (map.hasLayer(halo)) map.removeLayer(halo); + if (hasHalo) map.removeLayer(halo); halo = L.circleMarker(loc, { weight: 2.5, @@ -107,7 +111,7 @@ OSM.NewNote = function (map) { map.addLayer(noteLayer); - var params = qs.parse(path.substring(path.indexOf("?") + 1)); + var params = Qs.parse(path.substring(path.indexOf("?") + 1)); var markerLatlng; if (params.lat && params.lon) { @@ -158,8 +162,8 @@ OSM.NewNote = function (map) { }; page.unload = function () { - noteLayer.removeLayer(newNote); - map.removeLayer(halo); + if (newNote) noteLayer.removeLayer(newNote); + if (halo) map.removeLayer(halo); addNoteButton.removeClass("active"); };