Merge remote-tracking branch 'upstream/pull/2431'

[rails.git] / app / assets / javascripts / index / notes.js

diff --git a/app/assets/javascripts/index/notes.js b/app/assets/javascripts/index/notes.js
index 61067adba8ed9b2f2948482d306be64985a86d03..5d553e970c4be49aa9a05f0c6984c1e0361429d3 100644 (file)
--- a/app/assets/javascripts/index/notes.js
+++ b/app/assets/javascripts/index/notes.js
@@ -33,22 +33,22 @@ OSM.initializeNotes = function (map) {
     }
   });
 
     }
   });
 

-  noteLayer.on('click', function(e) {
+  noteLayer.on("click", function (e) {

     if (e.layer.id) {
     if (e.layer.id) {

-      OSM.router.route('/note/' + e.layer.id);
+      OSM.router.route("/note/" + e.layer.id);

     }
   });
 
     }
   });
 

-  function updateMarker(marker, feature) {
+  function updateMarker(old_marker, feature) {
+    var marker = old_marker;

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

-        title: feature.properties.comments && feature.properties.comments[0] ?
-          feature.properties.comments[0].text : undefined,
+        title: feature.properties.comments[0].text,

         opacity: 0.8,
         opacity: 0.8,

-        clickable: true
+        interactive: true

       });
       marker.id = feature.properties.id;
       marker.addTo(noteLayer);
       });
       marker.id = feature.properties.id;
       marker.addTo(noteLayer);


@@ -56,7 +56,7 @@ OSM.initializeNotes = function (map) {
     return marker;
   }
 
     return marker;
   }
 

-  noteLayer.getLayerId = function(marker) {
+  noteLayer.getLayerId = function (marker) {

     return marker.id;
   };
 
     return marker.id;
   };