Added description, user_id, user_ip columns to notes

[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 e3a6b4c80acf743d83ce7d56100f009737092bde..885d7d2c994b22f5a35b27d1143b5df3254fa75e 100644 (file)
--- a/app/assets/javascripts/index/new_note.js
+++ b/app/assets/javascripts/index/new_note.js
@@ -35,39 +35,21 @@ OSM.NewNote = function (map) {
     OSM.router.route("/note/new");
   });
 
     OSM.router.route("/note/new");
   });
 

-  function createNote(marker, form, url) {
-    var location = marker.getLatLng().wrap();
-
-    marker.options.draggable = false;
-    marker.dragging.disable();
-
-    $(form).find("input[type=submit]").prop("disabled", true);
-
+  function createNote(location, text, callback) {

     $.ajax({
     $.ajax({

-      url: url,
+      url: "/api/0.6/notes.json",

       type: "POST",
       oauth: true,
       data: {
         lat: location.lat,
         lon: location.lng,
       type: "POST",
       oauth: true,
       data: {
         lat: location.lat,
         lon: location.lng,

-        text: $(form.text).val()
+        text

       },
       },

-      success: function (feature) {
-        noteCreated(feature, marker);
-      }
+      success: callback

     });
     });

-
-    function noteCreated(feature, marker) {
-      content.find("textarea").val("");
-      updateMarker(feature);
-      newNoteMarker = null;
-      noteLayer.removeLayer(marker);
-      addNoteButton.removeClass("active");
-      OSM.router.route("/note/" + feature.properties.id);
-    }

   }
 
   }
 

-  function updateMarker(feature) {
+  function addCreatedNoteMarker(feature) {

     var marker = L.marker(feature.geometry.coordinates.reverse(), {
       icon: noteIcons[feature.properties.status],
       opacity: 0.9,
     var marker = L.marker(feature.geometry.coordinates.reverse(), {
       icon: noteIcons[feature.properties.status],
       opacity: 0.9,


@@ -75,38 +57,78 @@ OSM.NewNote = function (map) {
     });
     marker.id = feature.properties.id;
     marker.addTo(noteLayer);
     });
     marker.id = feature.properties.id;
     marker.addTo(noteLayer);

-    return marker;

   }
 
   }
 

-  page.pushstate = page.popstate = function (path) {
-    OSM.loadSidebarContent(path, function () {
-      page.load(path);
+  function addHalo(latlng) {
+    if (halo) map.removeLayer(halo);
+
+    halo = L.circleMarker(latlng, {
+      weight: 2.5,
+      radius: 20,
+      fillOpacity: 0.5,
+      color: "#FF6200"

     });
     });

-  };

 
 

-  function newHalo(loc, a) {
-    var hasHalo = halo && map.hasLayer(halo);
+    map.addLayer(halo);
+  }

 
 

-    if (a === "dragstart" && hasHalo) {
-      map.removeLayer(halo);
-    } else {
-      if (hasHalo) map.removeLayer(halo);
+  function removeHalo() {
+    if (halo) map.removeLayer(halo);
+    halo = null;
+  }

 
 

-      halo = L.circleMarker(loc, {
-        weight: 2.5,
-        radius: 20,
-        fillOpacity: 0.5,
-        color: "#FF6200"
-      });
+  function addNewNoteMarker(latlng) {
+    if (newNoteMarker) map.removeLayer(newNoteMarker);

 
 

-      map.addLayer(halo);
-    }
+    newNoteMarker = L.marker(latlng, {
+      icon: noteIcons.new,
+      opacity: 0.9,
+      draggable: true
+    });
+
+    newNoteMarker.on("dragstart dragend", function (a) {
+      removeHalo();
+      if (a.type === "dragend") {
+        addHalo(newNoteMarker.getLatLng());
+      }
+    });
+
+    newNoteMarker.addTo(map);
+    addHalo(newNoteMarker.getLatLng());
+
+    newNoteMarker.on("dragend", function () {
+      content.find("textarea").focus();
+    });

   }
 
   }
 

-  page.load = function (path) {
-    if (addNoteButton.hasClass("disabled")) return;
-    if (addNoteButton.hasClass("active")) return;
+  function removeNewNoteMarker() {
+    removeHalo();
+    if (newNoteMarker) map.removeLayer(newNoteMarker);
+    newNoteMarker = null;
+  }
+
+  function moveNewNotMarkerToClick(e) {
+    if (newNoteMarker) newNoteMarker.setLatLng(e.latlng);
+    if (halo) halo.setLatLng(e.latlng);
+    content.find("textarea").focus();
+  }
+
+  function updateControls() {
+    const zoomedOut = addNoteButton.hasClass("disabled");
+    const withoutText = content.find("textarea").val() === "";

 
 

+    content.find("#new-note-zoom-warning").prop("hidden", !zoomedOut);
+    content.find("input[type=submit]").prop("disabled", zoomedOut || withoutText);
+    if (newNoteMarker) newNoteMarker.setOpacity(zoomedOut ? 0.5 : 0.9);
+  }
+
+  page.pushstate = page.popstate = function (path) {
+    OSM.loadSidebarContent(path, function () {
+      page.load(path);
+    });
+  };
+
+  page.load = function (path) {

     addNoteButton.addClass("active");
 
     map.addLayer(noteLayer);
     addNoteButton.addClass("active");
 
     map.addLayer(noteLayer);


@@ -124,44 +146,39 @@ OSM.NewNote = function (map) {
       padding: [50, 50]
     });
 
       padding: [50, 50]
     });
 

-    newNoteMarker = L.marker(markerLatlng, {
-      icon: noteIcons.new,
-      opacity: 0.9,
-      draggable: true
-    });
-
-    newNoteMarker.on("dragstart dragend", function (a) {
-      newHalo(newNoteMarker.getLatLng(), a.type);
-    });
-
-    newNoteMarker.addTo(noteLayer);
-    newHalo(newNoteMarker.getLatLng());
-
-    newNoteMarker.on("remove", function () {
-      addNoteButton.removeClass("active");
-    }).on("dragend", function () {
-      content.find("textarea").focus();
-    });
+    addNewNoteMarker(markerLatlng);

 
     content.find("textarea")
 
     content.find("textarea")

-      .on("input", disableWhenBlank)
+      .on("input", updateControls)

       .focus();
 
       .focus();
 

-    function disableWhenBlank(e) {
-      $(e.target.form.add).prop("disabled", $(e.target).val() === "");
-    }
-

     content.find("input[type=submit]").on("click", function (e) {
     content.find("input[type=submit]").on("click", function (e) {

+      const location = newNoteMarker.getLatLng().wrap();
+      const text = content.find("textarea").val();
+

       e.preventDefault();
       e.preventDefault();

-      createNote(newNoteMarker, e.target.form, "/api/0.6/notes.json");
+      $(this).prop("disabled", true);
+      newNoteMarker.options.draggable = false;
+      newNoteMarker.dragging.disable();
+
+      createNote(location, text, (feature) => {
+        content.find("textarea").val("");
+        addCreatedNoteMarker(feature);
+        OSM.router.route("/note/" + feature.properties.id);
+      });

     });
 
     });
 

+    map.on("click", moveNewNotMarkerToClick);
+    addNoteButton.on("disabled enabled", updateControls);
+    updateControls();
+

     return map.getState();
   };
 
   page.unload = function () {
     return map.getState();
   };
 
   page.unload = function () {

-    if (newNoteMarker) noteLayer.removeLayer(newNoteMarker);
-    if (halo) map.removeLayer(halo);
+    map.off("click", moveNewNotMarkerToClick);
+    addNoteButton.off("disabled enabled", updateControls);
+    removeNewNoteMarker();

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