Use html5shiv for IE8 compatibility

[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..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]);
         }
         } else if (marker) {
           marker.setIcon(noteIcons[feature.properties.status]);
         }

-        page.load();
+        OSM.loadSidebarContent(window.location.pathname, page.load);

       }
     });
   }
       }
     });
   }


@@ -70,15 +70,20 @@ OSM.Note = function (map) {
 
     var data = $('.details').data();
     if (!noteState) map.addLayer(noteLayer);
 
     var data = $('.details').data();
     if (!noteState) map.addLayer(noteLayer);

-    if (window.location.hash == "") {
+    if (!window.location.hash) {

       var coords = data.coordinates.split(',');
       var coords = data.coordinates.split(',');

+      OSM.route.moveListenerOff();
+      map.once('moveend', OSM.route.moveListenerOn);
+

       map.getZoom() > 15 ? map.panTo(coords) : map.setView(coords, 16);
     }
 
     if (!map.hasLayer(halo)) {
       halo = L.circleMarker(data.coordinates.split(','), {
         weight: 2.5,
       map.getZoom() > 15 ? map.panTo(coords) : map.setView(coords, 16);
     }
 
     if (!map.hasLayer(halo)) {
       halo = L.circleMarker(data.coordinates.split(','), {
         weight: 2.5,

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

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