Merge pull request #5333 from AntonKhorev/auth-buttons-same-as-preferred

[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 b1c07bbbf85ec0ba85689195739a3d230a8333d3..887ba043b12b00bda5478b4e2dfd3aeec305efd3 100644 (file)
--- a/app/assets/javascripts/index/new_note.js
+++ b/app/assets/javascripts/index/new_note.js
@@ -85,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,


@@ -137,8 +139,6 @@ OSM.NewNote = function (map) {
 
     newNote.on("remove", function () {
       addNoteButton.removeClass("active");
 
     newNote.on("remove", function () {
       addNoteButton.removeClass("active");

-    }).on("dragstart", function () {
-      $(newNote).stopTime("removenote");

     }).on("dragend", function () {
       content.find("textarea").focus();
     });
     }).on("dragend", function () {
       content.find("textarea").focus();
     });


@@ -160,8 +160,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");
   };