X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/38255f9f8d7363b51350338fdda5753647aca1af..d1660a1c4fb71b61b7bd9181a2ec3822652bc29e:/app/assets/javascripts/index/notes.js.erb

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index e67749f07..4d796a3de 100644
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -41,6 +41,10 @@ $(document).ready(function () {
     }
   });
 
+  map.on("popupopen", function (e) {
+    $(e.popup._container).find(".comment").focus();
+  });
+
   map.on("popupclose", function (e) {
     if (newNote && e.popup == newNote._popup) {
       $(newNote).oneTime(10, "removenote", function () {
@@ -71,22 +75,22 @@ $(document).ready(function () {
   }
 
   function updateMarker(marker, feature) {
-    var icon = noteIcons[feature.properties.status];
-    var popupContent = createPopupContent(marker, feature.properties);
-
     if (marker)
     {
       marker.setIcon(noteIcons[feature.properties.status]);
-      marker._popup.setContent(popupContent);
+      marker._popup.setContent(createPopupContent(marker, feature.properties));
     }
     else
     {
       marker = L.marker(feature.geometry.coordinates.reverse(), {
-        icon: icon,
+        icon: noteIcons[feature.properties.status],
         opacity: 0.7
       });
 
-      marker.addTo(noteLayer).bindPopup(popupContent, popupOptions());
+      marker.addTo(noteLayer).bindPopup(
+        createPopupContent(marker, feature.properties),
+        popupOptions()
+      );
     }
 
     return marker;
@@ -157,7 +161,8 @@ $(document).ready(function () {
 
     content.find("input[type=submit]").on("click", function (e) {
       e.preventDefault();
-      updateNote(marker, e.target.form, $(e.target).data("url"));
+      var data = $(e.target).data();
+      updateNote(marker, e.target.form, data.method, data.url);
     });
 
     return content[0];
@@ -166,6 +171,9 @@ $(document).ready(function () {
   function createNote(marker, form, url) {
     var location = marker.getLatLng();
 
+    marker.options.draggable = false;
+    marker.dragging.disable();
+
     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({
@@ -186,21 +194,27 @@ $(document).ready(function () {
     });
   }
 
-  function updateNote(marker, form, url) {
+  function updateNote(marker, form, method, url) {
     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({
       url: url,
-      type: "POST",
+      type: method,
       oauth: true,
       data: {
         text: $(form.text).val()
       },
       success: function (feature) {
-        var popupContent = createPopupContent(marker, feature.properties);
+        if (feature.properties.status == "hidden") {
+          noteLayer.removeLayer(marker);
+
+          delete notes[feature.properties.id];
+        } else {
+          var popupContent = createPopupContent(marker, feature.properties);
 
-        marker.setIcon(noteIcons[feature.properties.status]);
-        marker._popup.setContent(popupContent);
+          marker.setIcon(noteIcons[feature.properties.status]);
+          marker._popup.setContent(popupContent);
+        }
       }
     });
   }