Merge remote-tracking branch 'upstream/master' into vagrant

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d07c9797d0da09197a8ee4a2758a977658da0857..dc3c932773066ce56a518a9b1c921659cf5ee7e8 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -150,7 +150,8 @@ $(document).ready(function () {
       map.getLayersCode(),
       map._object);
 
-    $.cookie("_osm_location", cookieContent(map), { expires: expiry });
+    $.removeCookie("_osm_location");
+    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
   });
 
   if ($.cookie('_osm_welcome') == 'hide') {
@@ -228,7 +229,7 @@ $(document).ready(function () {
 
     page.load = function() {
       if (!("autofocus" in document.createElement("input"))) {
-        $(".search_form input[name=query]").focus();
+        $("#sidebar .search_form input[name=query]").focus();
       }
       return map.getState();
     };
@@ -332,7 +333,7 @@ $(document).ready(function () {
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
-    var precision = zoomPrecision(map.getZoom());
+    var precision = OSM.zoomPrecision(map.getZoom());
     OSM.router.route("/search?query=" + encodeURIComponent(
       map.getCenter().lat.toFixed(precision) + "," +
       map.getCenter().lng.toFixed(precision)));