Merge remote-tracking branch 'upstream/pull/4888'

[rails.git] / 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 9d68ab65c8fc62b2a4eb2bb1147bb3f2742b0e31..59fbeeb1d6aa35146a0808c950923373c3d9f10b 100644 (file)
--- 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) {
 
 OSM.NewNote = function (map) {

-  var querystring = require("querystring-component");
-

   var noteLayer = map.noteLayer,
       content = $("#sidebar_content"),
       page = {},
   var noteLayer = map.noteLayer,
       content = $("#sidebar_content"),
       page = {},


@@ -87,10 +85,12 @@ OSM.NewNote = function (map) {
   };
 
   function newHalo(loc, a) {
   };
 
   function newHalo(loc, a) {

-    if (a === "dragstart" && map.hasLayer(halo)) {
+    var hasHalo = halo && map.hasLayer(halo);
+
+    if (a === "dragstart" && hasHalo) {

       map.removeLayer(halo);
     } else {
       map.removeLayer(halo);
     } else {

-      if (map.hasLayer(halo)) map.removeLayer(halo);
+      if (hasHalo) map.removeLayer(halo);

 
       halo = L.circleMarker(loc, {
         weight: 2.5,
 
       halo = L.circleMarker(loc, {
         weight: 2.5,


@@ -111,7 +111,7 @@ OSM.NewNote = function (map) {
 
     map.addLayer(noteLayer);
 
 
     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) {
     var markerLatlng;
 
     if (params.lat && params.lon) {


@@ -162,8 +162,8 @@ OSM.NewNote = function (map) {
   };
 
   page.unload = function () {
   };
 
   page.unload = function () {

-    noteLayer.removeLayer(newNote);
-    map.removeLayer(halo);
+    if (newNote) noteLayer.removeLayer(newNote);
+    if (halo) map.removeLayer(halo);

     addNoteButton.removeClass("active");
   };
 
     addNoteButton.removeClass("active");
   };