Merge branch 'master' into redesign

[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 b9730bf1da08b5e1147d19186353ffe1cb2d11f9..09044bf0ef35219a477a9495ab5cda5d30cc6172 100644 (file)
--- a/app/assets/javascripts/index/note.js.erb
+++ b/app/assets/javascripts/index/note.js.erb
@@ -38,7 +38,7 @@ OSM.Note = function (map) {
         } else if (marker) {
           marker.setIcon(noteIcons[feature.properties.status]);
         }
-        page.load();
+        OSM.loadSidebarContent(window.location.pathname, page.load);
       }
     });
   }
@@ -70,8 +70,11 @@ OSM.Note = function (map) {
 
     var data = $('.details').data();
     if (!noteState) map.addLayer(noteLayer);
-    if (window.location.hash == "") {
+    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);
     }