From: Aaron Lidman <aaronlidman@gmail.com>
Date: Tue, 12 Nov 2013 00:37:23 +0000 (-0800)
Subject: Add note selection to the sidebar
X-Git-Tag: live~4668^2~117
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/85282f5cdd5b37016027feda0a16d8cbdc6a2581

Add note selection to the sidebar
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index f16589eee..378244db4 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -203,11 +203,7 @@ $(document).ready(function () {
     page.load = function(path, type, id) {
       if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
 
-      if (type === 'note') {
-        map.noteLayer.showNote(parseInt(id));
-      } else {
-        map.addObject({type: type, id: parseInt(id)}, {zoom: true});
-      }
+      map.addObject({type: type, id: parseInt(id)}, {zoom: true});
     };
 
     page.unload = function() {
diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index 75ca5ad50..70335748e 100644
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -41,42 +41,24 @@ function initializeNotes(map) {
         map.removeLayer(newNote);
         newNote = null;
       });
-    }
-  }).on("popupopen", function (e) {
-    if (!('ontouchstart' in document.documentElement)) {
-      $(e.popup._container).find(".comment").focus();
-    }
-  });
+    } 
+  })
 
-  noteLayer.showNote = function(id) {
-    $.ajax({
-      url: "/api/" + OSM.API_VERSION + "/notes/" + id + ".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.route('/browse/note/' + e.layer.id);
+  })
 
   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],
-        opacity: 0.9
+        opacity: 0.9,
+        clickable: true
       });
       marker.id = feature.properties.id;
-      marker.addTo(noteLayer).bindPopup(
-        createPopupContent(marker, feature.properties),
-        popupOptions()
-      );
+      marker.addTo(noteLayer);
     }
     return marker;
   }
@@ -180,15 +162,19 @@ function initializeNotes(map) {
         lon: location.lng,
         text: $(form.text).val()
       },
-      success: noteCreated
+      success: function(feature) {
+        noteCreated(feature, marker);
+      }
     });
 
-    function noteCreated(feature) {
+    function noteCreated(feature, marker) {
       $(marker._popup._content).find("textarea").val("");
 
-      notes[feature.properties.id] = updateMarker(marker, feature);
+      notes[feature.properties.id] = updateMarker(false, feature);
+      OSM.route('/browse/note/' + feature.properties.id);
       newNote = null;
-
+      marker.closePopup();
+      noteLayer.removeLayer(marker);
       addNoteButton.removeClass("active");
     }
   }
diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb
index 63fab5306..75700913f 100644
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -49,7 +49,7 @@ L.OSM.Map = L.Map.extend({
       })
     ];
 
-    this.noteLayer = new L.LayerGroup();
+    this.noteLayer = new L.FeatureGroup();
     this.noteLayer.options = {code: 'N'};
 
     this.dataLayer = new L.OSM.DataLayer(null);