X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7092491b069de43bb8d8c30d3526e7095c5cc98..f9ea6aa718a5babc16bb5195098b504a1bd43e32:/app/assets/javascripts/index/new_note.js?ds=sidebyside diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js index 9d68ab65c..59fbeeb1d 100644 --- a/app/assets/javascripts/index/new_note.js +++ b/app/assets/javascripts/index/new_note.js @@ -1,8 +1,6 @@ -//= require querystring +//= require qs/dist/qs OSM.NewNote = function (map) { - var querystring = require("querystring-component"); - var noteLayer = map.noteLayer, content = $("#sidebar_content"), page = {}, @@ -87,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, @@ -111,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) { @@ -162,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"); };