Position on notes correctly when a link to a comment is loaded

[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 8c2ab5c5671f8d629e9a083eb3212f0e16c335e0..2a2599a3ca3140267b0453e018c3617814686e65 100644 (file)
--- a/app/assets/javascripts/index/note.js.erb
+++ b/app/assets/javascripts/index/note.js.erb
@@ -61,16 +61,17 @@ OSM.Note = function (map) {
 
     content.find("textarea").val('').trigger("input");
 
 
     content.find("textarea").val('').trigger("input");
 

-    var data = $('.details').data();
-    if (!window.location.hash) {
-      var coords = data.coordinates.split(',');
-      OSM.route.moveListenerOff();
-      map.once('moveend', OSM.route.moveListenerOn);
-      map.getZoom() > 15 ? map.panTo(coords) : map.setView(coords, 16);
+    var data = $('.details').data(),
+      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.getZoom() > 15 ? map.panTo(latLng) : map.setView(latLng, 16);

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

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

         weight: 2.5,
         radius: 20,
         fillOpacity: 0.5,
         weight: 2.5,
         radius: 20,
         fillOpacity: 0.5,


@@ -80,7 +81,7 @@ OSM.Note = function (map) {
     }
 
     if (map.hasLayer(currentNote)) map.removeLayer(currentNote);
     }
 
     if (map.hasLayer(currentNote)) map.removeLayer(currentNote);

-    currentNote = L.marker(data.coordinates.split(','), {
+    currentNote = L.marker(latLng, {

       icon: noteIcons[data.status],
       opacity: 1,
       clickable: true
       icon: noteIcons[data.status],
       opacity: 1,
       clickable: true