Add 'x' to close welcome box; remember preference

[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 54e0d5df7d2e700715dbfd27d42a835c1fb64365..841ae1f7bdf652096e80399782474513deb1d880 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -1,11 +1,6 @@
-//= require templates/notes/show
-//= require templates/notes/new
-
-$(document).ready(function () {
-  var params = OSM.mapParams(),
-      noteLayer = new L.LayerGroup(),
-      notes = {},
-      newNote;
+function initializeNotes(map) {
+  var noteLayer = map.noteLayer,
+      notes = {};

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


@@ -25,13 +20,6 @@ $(document).ready(function () {
     })
   };
 
     })
   };
 

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

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


@@ -43,59 +31,31 @@ $(document).ready(function () {
       noteLayer.clearLayers();
       notes = {};
     }
       noteLayer.clearLayers();
       notes = {};
     }

-  }).on("popupclose", function (e) {
-    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 (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);
-
-          notes[feature.properties.id] = marker;
-
-          map.addLayer(noteLayer);
-          marker.openPopup();
-        }
-      });
-    }
-  }
+  noteLayer.on('click', function(e) {
+    OSM.router.route('/note/' + e.layer.id);
+  });

 
   function updateMarker(marker, feature) {
     if (marker) {
       marker.setIcon(noteIcons[feature.properties.status]);
 
   function updateMarker(marker, feature) {
     if (marker) {
       marker.setIcon(noteIcons[feature.properties.status]);

-      marker.setPopupContent(createPopupContent(
-        marker, feature.properties,
-        $(marker._popup._content).find("textarea").val()
-      ));

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

-        opacity: 0.9
+        opacity: 0.8,
+        clickable: true

       });
       });

-
-      marker.addTo(noteLayer).bindPopup(
-        createPopupContent(marker, feature.properties),
-        popupOptions()
-      );
+      marker.id = feature.properties.id;
+      marker.addTo(noteLayer);

     }
     }

-

     return marker;
   }
 
     return marker;
   }
 

+  noteLayer.getLayerId = function(marker) {
+    return marker.id;
+  };
+

   var noteLoader;
 
   function loadNotes() {
   var noteLoader;
 
   function loadNotes() {


@@ -115,9 +75,7 @@ $(document).ready(function () {
 
     function success(json) {
       var oldNotes = notes;
 
     function success(json) {
       var oldNotes = notes;

-

       notes = {};
       notes = {};

-

       json.features.forEach(updateMarkers);
 
       function updateMarkers(feature) {
       json.features.forEach(updateMarkers);
 
       function updateMarkers(feature) {


@@ -126,162 +84,11 @@ $(document).ready(function () {
         notes[feature.properties.id] = updateMarker(marker, feature);
       }
 
         notes[feature.properties.id] = updateMarker(marker, feature);
       }
 

-      for (id in oldNotes) {
+      for (var id in oldNotes) {

         noteLayer.removeLayer(oldNotes[id]);
       }
 
       noteLoader = null;
     }
         noteLayer.removeLayer(oldNotes[id]);
       }
 
       noteLoader = null;
     }

-  };
-
-  function popupOptions() {
-    var mapSize = map.getSize();
-
-    return {
-      minWidth: 320,
-      maxWidth: mapSize.y * 1 / 3,
-      maxHeight: mapSize.y * 2 / 3,
-      offset: new L.Point(0, -40),
-      autoPanPadding: new L.Point(60, 40)
-    };
-  }
-
-  function createPopupContent(marker, properties, comment) {
-    var content = $(JST["templates/notes/show"]({ note: properties }));
-
-    content.find("textarea").on("input", function (e) {
-      var form = e.target.form;
-
-      if ($(e.target).val() == "") {
-        $(form.close).val(I18n.t("javascripts.notes.show.resolve"));
-        $(form.comment).prop("disabled", true);
-      } else {
-        $(form.close).val(I18n.t("javascripts.notes.show.comment_and_resolve"));
-        $(form.comment).prop("disabled", false);
-      }
-    });
-
-    content.find("input[type=submit]").on("click", function (e) {
-      e.preventDefault();
-      var data = $(e.target).data();
-      updateNote(marker, e.target.form, data.method, data.url);
-    });
-
-    if (comment) {
-      content.find("textarea").val(comment).trigger("input");
-    }
-
-    return content[0];
-  }
-
-  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({
-      url: url,
-      type: "POST",
-      oauth: true,
-      data: {
-        lat: location.lat,
-        lon: location.lng,
-        text: $(form.text).val()
-      },
-      success: noteCreated
-    });
-
-    function noteCreated(feature) {
-      $(marker._popup._content).find("textarea").val("");
-
-      notes[feature.properties.id] = updateMarker(marker, feature);
-      newNote = null;
-
-      $("#createnoteanchor").removeClass("disabled").addClass("geolink");
-    }

   }
   }

-
-  function updateNote(marker, form, method, url) {
-    $(form).find("input[type=submit]").prop("disabled", true);
-
-    $.ajax({
-      url: url,
-      type: method,
-      oauth: true,
-      data: {
-        text: $(form.text).val()
-      },
-      success: function (feature) {
-        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.setPopupContent(popupContent);
-        }
-      }
-    });
-  }
-
-  $(".leaflet-control-attribution").on("click", "#createnoteanchor", function (e) {
-    e.preventDefault();
-
-    if ($(e.target).hasClass("disabled")) return;
-
-    $(e.target).removeClass("geolink").addClass("disabled");
-
-    map.addLayer(noteLayer);
-
-    var mapSize = map.getSize();
-    var markerPosition;
-
-    if (mapSize.y > 800) {
-      markerPosition = [mapSize.x / 2, mapSize.y / 2];
-    } else if (mapSize.y > 400) {
-      markerPosition = [mapSize.x / 2, 400];
-    } else {
-      markerPosition = [mapSize.x / 2, mapSize.y];
-    }
-
-    newNote = L.marker(map.containerPointToLatLng(markerPosition), {
-      icon: noteIcons["new"],
-      opacity: 0.9,
-      draggable: true
-    });
-
-    var popupContent = $(JST["templates/notes/new"]({
-        create_url: $(e.target).attr("href")
-    }));
-
-    popupContent.find("textarea").on("input", disableWhenBlank);
-
-    function disableWhenBlank(e) {
-      $(e.target.form).prop("disabled", $(e.target).val() === "");
-    }
-
-    popupContent.find("input[type=submit]").on("click", function (e) {
-      e.preventDefault();
-      createNote(newNote, e.target.form, $(e.target).data("url"));
-    });
-
-    newNote.addTo(noteLayer).bindPopup(popupContent[0], popupOptions()).openPopup();
-
-    newNote.on("remove", function (e) {
-      $("#createnoteanchor").removeClass("disabled").addClass("geolink");
-    });
-
-    newNote.on("dragstart", function (e) {
-      $(newNote).stopTime("removenote");
-    });
-
-    newNote.on("dragend", function (e) {
-      e.target.openPopup();
-    });
-  });
-});
+}