Fix gap for iconless nodes in history view

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index c90d96c3997d93219c95293c8fd192f1bb27a7cc..6118c8e0d741c7a3ef0614d24f3e91b922e69aab 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,7 +5,7 @@
 //= require index/notes
 
 $(document).ready(function () {
 //= require index/notes
 
 $(document).ready(function () {

-  var permalinks = $("#permalink").html();
+  var permalinks = $("#permalink").detach().html();

   var marker;
   var params = OSM.mapParams();
   var map = createMap("map");
   var marker;
   var params = OSM.mapParams();
   var map = createMap("map");


@@ -14,7 +14,7 @@ $(document).ready(function () {
 
   map.attributionControl.setPrefix(permalinks);
 
 
   map.attributionControl.setPrefix(permalinks);
 

-  map.on("moveend baselayerchange", updateLocation);
+  map.on("moveend layeradd layerremove", updateLocation);

 
   if (!params.object_zoom) {
     if (params.bbox) {
 
   if (!params.object_zoom) {
     if (params.bbox) {


@@ -58,6 +58,10 @@ $(document).ready(function () {
       map.setView(centre, data.zoom);
     }
 
       map.setView(centre, data.zoom);
     }
 

+    if (data.type && data.id) {
+      addObjectToMap(data, true);
+    }
+

     if (marker) {
       map.removeLayer(marker);
     }
     if (marker) {
       map.removeLayer(marker);
     }


@@ -66,10 +70,10 @@ $(document).ready(function () {
   });
 
   function updateLocation() {
   });
 
   function updateLocation() {

-    var center = map.getCenter();
+    var center = map.getCenter().wrap();

     var zoom = map.getZoom();
     var layers = getMapLayers();
     var zoom = map.getZoom();
     var layers = getMapLayers();

-    var extents = map.getBounds();
+    var extents = map.getBounds().wrap();

 
     updatelinks(center.lng,
                 center.lat,
 
     updatelinks(center.lng,
                 center.lat,


@@ -129,4 +133,10 @@ $(document).ready(function () {
   if ($("#query").val()) {
     $("#search_form").submit();
   }
   if ($("#query").val()) {
     $("#search_form").submit();
   }

+
+  // Focus the search field for browsers that don't support
+  // the HTML5 'autofocus' attribute
+  if (!("autofocus" in document.createElement("input"))) {
+    $("#query").focus();
+  }

 });
 });