X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c4c0e8105a8edc35205add749f461ec7be689aef..bc70cae711fb6947233d6a750cb33f115aa7a01b:/app/assets/javascripts/index/new_note.js?ds=inline diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js index fbb6a25c4..887ba043b 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 = querystring.parse(path.substring(path.indexOf("?") + 1)); + var params = Qs.parse(path.substring(path.indexOf("?") + 1)); var markerLatlng; if (params.lat && params.lon) { @@ -135,8 +139,6 @@ OSM.NewNote = function (map) { newNote.on("remove", function () { addNoteButton.removeClass("active"); - }).on("dragstart", function () { - $(newNote).stopTime("removenote"); }).on("dragend", function () { content.find("textarea").focus(); }); @@ -158,8 +160,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"); };