Resolve conflict

[rails.git] / app / assets / javascripts / index / note.js.erb

diff --git a/app/assets/javascripts/index/note.js.erb b/app/assets/javascripts/index/note.js.erb
index 6458626f41abb25eca8cdada6b847251878c22c1..18000deb05ab2ea4e963f8e7e3b1a9e6ff9db953 100644 (file)
--- a/app/assets/javascripts/index/note.js.erb
+++ b/app/assets/javascripts/index/note.js.erb
@@ -2,8 +2,7 @@ OSM.Note = function (map) {
   var noteLayer = map.noteLayer,
     content = $('#sidebar_content'),
     page = {},
   var noteLayer = map.noteLayer,
     content = $('#sidebar_content'),
     page = {},

-    noteState = map.hasLayer(noteLayer),
-    halo;
+    halo, currentNote;

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


@@ -23,7 +22,7 @@ OSM.Note = function (map) {
     })
   };
 
     })
   };
 

-  function updateNote(marker, form, method, url) {
+  function updateNote(form, method, url) {

     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({
     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({


@@ -31,27 +30,31 @@ OSM.Note = function (map) {
       type: method,
       oauth: true,
       data: {text: $(form.text).val()},
       type: method,
       oauth: true,
       data: {text: $(form.text).val()},

-      success: function (feature) {
-        marker = noteLayer.getLayer(marker);
-        if (feature.properties.status == "hidden") {
-          noteLayer.removeLayer(marker);
-        } else if (marker) {
-          marker.setIcon(noteIcons[feature.properties.status]);
-        }
-        page.load();
+      success: function () {
+        OSM.loadSidebarContent(window.location.pathname, page.load);

       }
     });
   }
 
   page.pushstate = page.popstate = function (path) {
       }
     });
   }
 
   page.pushstate = page.popstate = function (path) {

-    OSM.loadSidebarContent(path, page.load);
+    OSM.loadSidebarContent(path, function() {
+      initialize(function() {
+        var data = $('.details').data(),
+          latLng = L.latLng(data.coordinates.split(','));
+        if (!map.getBounds().contains(latLng)) moveToNote();        
+      });
+    });
+  };
+
+  page.load = function() {
+    initialize(moveToNote);

   };
 
   };
 

-  page.load = function () {
+  function initialize(callback) {

     content.find("input[type=submit]").on("click", function (e) {
       e.preventDefault();
       var data = $(e.target).data();
     content.find("input[type=submit]").on("click", function (e) {
       e.preventDefault();
       var data = $(e.target).data();

-      updateNote(data.noteId, e.target.form, data.method, data.url);
+      updateNote(e.target.form, data.method, data.url);

     });
 
     content.find("textarea").on("input", function (e) {
     });
 
     content.find("textarea").on("input", function (e) {


@@ -68,25 +71,45 @@ OSM.Note = function (map) {
 
     content.find("textarea").val('').trigger("input");
 
 
     content.find("textarea").val('').trigger("input");
 

-    var data = $('.details').data();
-    if (!noteState) map.addLayer(noteLayer);
-    if (window.location.hash == "") {
-      var coords = data.coordinates.split(',');
-      map.getZoom() > 15 ? map.panTo(coords) : map.setView(coords, 16);
-    }
+    var data = $('.details').data(),
+      latLng = L.latLng(data.coordinates.split(','));

 
     if (!map.hasLayer(halo)) {
 
     if (!map.hasLayer(halo)) {

-      halo = L.circleMarker(data.coordinates.split(','), {
+      halo = L.circleMarker(latLng, {

         weight: 2.5,
         weight: 2.5,

-        radius: 20
+        radius: 20,
+        fillOpacity: 0.5,
+        color: "#FF6200"

       });
       map.addLayer(halo);
     }
       });
       map.addLayer(halo);
     }

+
+    if (map.hasLayer(currentNote)) map.removeLayer(currentNote);
+    currentNote = L.marker(latLng, {
+      icon: noteIcons[data.status],
+      opacity: 1,
+      clickable: true
+    });
+
+    map.addLayer(currentNote);
+
+    if (callback) callback();

   };
 
   };
 

+  function moveToNote() {
+    var data = $('.details').data(),
+      latLng = L.latLng(data.coordinates.split(','));
+
+    if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
+      OSM.router.moveListenerOff();
+      map.once('moveend', OSM.router.moveListenerOn);
+      map.setView(latLng, 15, {reset: true});
+    }
+  }
+

   page.unload = function () {
     if (map.hasLayer(halo)) map.removeLayer(halo);
   page.unload = function () {
     if (map.hasLayer(halo)) map.removeLayer(halo);

-    if (!noteState) map.removeLayer(noteLayer);
+    if (map.hasLayer(currentNote)) map.removeLayer(currentNote);

   };
 
   return page;
   };
 
   return page;