Merge pull request #4761 from AntonKhorev:dark-mode-with-close-button

[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 3111a579fa465c5f08c24d41a8cbb3e5784853cd..887ba043b12b00bda5478b4e2dfd3aeec305efd3 100644 (file)
--- a/app/assets/javascripts/index/new_note.js
+++ b/app/assets/javascripts/index/new_note.js
@@ -1,10 +1,12 @@
-OSM.NewNote = function(map) {
+//= require qs/dist/qs
+
+OSM.NewNote = function (map) {

   var noteLayer = map.noteLayer,
   var noteLayer = map.noteLayer,

-    content = $("#sidebar_content"),
-    page = {},
-    addNoteButton = $(".control-note .control-button"),
-    newNote,
-    halo;
+      content = $("#sidebar_content"),
+      page = {},
+      addNoteButton = $(".control-note .control-button"),
+      newNote,
+      halo;

 
   var noteIcons = {
     "new": L.icon({
 
   var noteIcons = {
     "new": L.icon({


@@ -83,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,


@@ -107,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) {


@@ -126,7 +130,7 @@ OSM.NewNote = function(map) {
       draggable: true
     });
 
       draggable: true
     });
 

-    newNote.on("dragstart dragend", function(a) {
+    newNote.on("dragstart dragend", function (a) {

       newHalo(newNote.getLatLng(), a.type);
     });
 
       newHalo(newNote.getLatLng(), a.type);
     });
 


@@ -135,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();
     });


@@ -158,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");
   };