Actually toggle note layer on click.

[rails.git] / 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 e540826ecb77de37b24151fa91ba17de71d8915c..ac73e13782945089c7933f60dc71ec635459e861 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -2,7 +2,10 @@
 //= require templates/notes/new
 
 $(document).ready(function () {
 //= require templates/notes/new
 
 $(document).ready(function () {

-  var params = OSM.mapParams();
+  var params = OSM.mapParams(),
+      noteLayer = new L.LayerGroup(),
+      notes = {},
+      newNote;

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


@@ -22,60 +25,46 @@ $(document).ready(function () {
     })
   };
 
     })
   };
 

-  var noteLayer = new L.LayerGroup();
-  var notes = {};
-  var newNote;
-

   layers.push({
     layer: noteLayer,
     layerCode: "N"
   });
 
   layers.push({
     layer: noteLayer,
     layerCode: "N"
   });
 

+  map.noteLayer = noteLayer;
+

   map.on("layeradd", function (e) {
     if (e.layer == noteLayer) {
       loadNotes();
       map.on("moveend", loadNotes);
     }
   map.on("layeradd", function (e) {
     if (e.layer == noteLayer) {
       loadNotes();
       map.on("moveend", loadNotes);
     }

-  });
-
-  map.on("layerremove", function (e) {
+  }).on("layerremove", function (e) {

     if (e.layer == noteLayer) {
       map.off("moveend", loadNotes);
       noteLayer.clearLayers();
       notes = {};
     }
     if (e.layer == noteLayer) {
       map.off("moveend", loadNotes);
       noteLayer.clearLayers();
       notes = {};
     }

-  });
-
-  // Don't focus the text area on touch devices to avoid flashing the keyboard
-  if (!('ontouchstart' in document.documentElement)) {
-    map.on("popupopen", function (e) {
-      $(e.popup._container).find(".comment").focus();
-    });
-  }
-
-  map.on("popupclose", function (e) {
+  }).on("popupclose", function (e) {

     if (newNote && e.popup == newNote._popup) {
       $(newNote).oneTime(10, "removenote", function () {
         map.removeLayer(newNote);
         newNote = null;
       });
     }
     if (newNote && e.popup == newNote._popup) {
       $(newNote).oneTime(10, "removenote", function () {
         map.removeLayer(newNote);
         newNote = null;
       });
     }

+  }).on("popupopen", function (e) {
+    if (!('ontouchstart' in document.documentElement)) {
+      $(e.popup._container).find(".comment").focus();
+    }

   });
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
   });
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {

-//    map.layersControl.addOverlay(noteLayer, I18n.t("browse.start_rjs.notes_layer_name"));
-

     if (params.layers) setMapLayers(params.layers);
     if (params.notes) map.addLayer(noteLayer);
     if (params.layers) setMapLayers(params.layers);
     if (params.notes) map.addLayer(noteLayer);

-

     if (params.note) {
       $.ajax({
         url: "/api/" + OSM.API_VERSION + "/notes/" + params.note + ".json",
         success: function (feature) {
           var marker = updateMarker(notes[feature.properties.id], feature);
     if (params.note) {
       $.ajax({
         url: "/api/" + OSM.API_VERSION + "/notes/" + params.note + ".json",
         success: function (feature) {
           var marker = updateMarker(notes[feature.properties.id], feature);

-

           notes[feature.properties.id] = marker;
           notes[feature.properties.id] = marker;

-

           map.addLayer(noteLayer);
           marker.openPopup();
         }
           map.addLayer(noteLayer);
           marker.openPopup();
         }


@@ -84,27 +73,22 @@ $(document).ready(function () {
   }
 
   function updateMarker(marker, feature) {
   }
 
   function updateMarker(marker, feature) {

-    if (marker)
-    {
+    if (marker) {

       marker.setIcon(noteIcons[feature.properties.status]);
       marker.setPopupContent(createPopupContent(
       marker.setIcon(noteIcons[feature.properties.status]);
       marker.setPopupContent(createPopupContent(

-        marker, feature.properties, 
+        marker, feature.properties,

         $(marker._popup._content).find("textarea").val()
       ));
         $(marker._popup._content).find("textarea").val()
       ));

-    }
-    else
-    {
+    } else {

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

-

       marker.addTo(noteLayer).bindPopup(
         createPopupContent(marker, feature.properties),
         popupOptions()
       );
     }
       marker.addTo(noteLayer).bindPopup(
         createPopupContent(marker, feature.properties),
         popupOptions()
       );
     }

-

     return marker;
   }
 
     return marker;
   }
 


@@ -121,26 +105,26 @@ $(document).ready(function () {
 
       noteLoader = $.ajax({
         url: url,
 
       noteLoader = $.ajax({
         url: url,

-        success: function (json) {
-          var oldNotes = notes;
-
-          notes = {};
-
-          json.features.forEach(function (feature) {
-            var marker = oldNotes[feature.properties.id];
+        success: success
+      });
+    }

 
 

-            delete oldNotes[feature.properties.id];
+    function success(json) {
+      var oldNotes = notes;
+      notes = {};
+      json.features.forEach(updateMarkers);

 
 

-            notes[feature.properties.id] = updateMarker(marker, feature);
-          });
+      function updateMarkers(feature) {
+        var marker = oldNotes[feature.properties.id];
+        delete oldNotes[feature.properties.id];
+        notes[feature.properties.id] = updateMarker(marker, feature);
+      }

 
 

-          for (id in oldNotes) {
-            noteLayer.removeLayer(oldNotes[id]);
-          }
+      for (id in oldNotes) {
+        noteLayer.removeLayer(oldNotes[id]);
+      }

 
 

-          noteLoader = null;
-        }
-      });
+      noteLoader = null;

     }
   };
 
     }
   };
 


@@ -201,15 +185,17 @@ $(document).ready(function () {
         lon: location.lng,
         text: $(form.text).val()
       },
         lon: location.lng,
         text: $(form.text).val()
       },

-      success: function (feature) {
-        $(marker._popup._content).find("textarea").val("");
+      success: noteCreated
+    });

 
 

-        notes[feature.properties.id] = updateMarker(marker, feature);
-        newNote = null;
+    function noteCreated(feature) {
+      $(marker._popup._content).find("textarea").val("");

 
 

-        $("#createnoteanchor").removeClass("disabled").addClass("geolink");
-      }
-    });
+      notes[feature.properties.id] = updateMarker(marker, feature);
+      newNote = null;
+
+      $("#createnoteanchor").removeClass("disabled").addClass("geolink");
+    }

   }
 
   function updateNote(marker, form, method, url) {
   }
 
   function updateNote(marker, form, method, url) {


@@ -249,16 +235,11 @@ $(document).ready(function () {
     var mapSize = map.getSize();
     var markerPosition;
 
     var mapSize = map.getSize();
     var markerPosition;
 

-    if (mapSize.y > 800)
-    {
+    if (mapSize.y > 800) {

       markerPosition = [mapSize.x / 2, mapSize.y / 2];
       markerPosition = [mapSize.x / 2, mapSize.y / 2];

-    }
-    else if (mapSize.y > 400)
-    {
+    } else if (mapSize.y > 400) {

       markerPosition = [mapSize.x / 2, 400];
       markerPosition = [mapSize.x / 2, 400];

-    }
-    else
-    {
+    } else {

       markerPosition = [mapSize.x / 2, mapSize.y];
     }
 
       markerPosition = [mapSize.x / 2, mapSize.y];
     }
 


@@ -268,17 +249,15 @@ $(document).ready(function () {
       draggable: true
     });
 
       draggable: true
     });
 

-    var popupContent = $(JST["templates/notes/new"]({ create_url: $(e.target).attr("href") }));
+    var popupContent = $(JST["templates/notes/new"]({
+        create_url: $(e.target).attr("href")
+    }));

 
 

-    popupContent.find("textarea").on("input", function (e) {
-      var form = e.target.form;
+    popupContent.find("textarea").on("input", disableWhenBlank);

 
 

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

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


@@ -289,13 +268,9 @@ $(document).ready(function () {
 
     newNote.on("remove", function (e) {
       $("#createnoteanchor").removeClass("disabled").addClass("geolink");
 
     newNote.on("remove", function (e) {
       $("#createnoteanchor").removeClass("disabled").addClass("geolink");

-    });
-
-    newNote.on("dragstart", function (e) {
+    }).on("dragstart", function (e) {

       $(newNote).stopTime("removenote");
       $(newNote).stopTime("removenote");

-    });
-
-    newNote.on("dragend", function (e) {
+    }).on("dragend", function (e) {

       e.target.openPopup();
     });
   });
       e.target.openPopup();
     });
   });