X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/258e66299ac45c4dbb951dee0a92194301b31737..2b42fd102a55f7af41b8e19dfcb7271abb72ed1d:/app/assets/javascripts/index/search.js

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 2f92e6282..c546469db 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -6,11 +6,13 @@ function initializeSearch(map) {
     $("#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();
-  }
+  $("#query")
+    .on("focus", function() {
+      $("#describe_location").fadeOut(100);
+    })
+    .on("blur", function() {
+      $("#describe_location").fadeIn(100);
+    });
 
   $("#sidebar_content").on("click", ".search_results_entry a.set_position", clickSearchResult);
 
@@ -21,17 +23,15 @@ function initializeSearch(map) {
 
     var bounds = map.getBounds();
 
-    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
+      zoom: map.getZoom(),
       minlon: bounds.getWest(),
       minlat: bounds.getSouth(),
       maxlon: bounds.getEast(),
       maxlat: bounds.getNorth()
     });
 
-    openSidebar();
-
     $("#sidebar").one("closed", function () {
       map.removeLayer(marker);
       map.removeObject();
@@ -66,11 +66,10 @@ function initializeSearch(map) {
     var center = map.getCenter(),
       zoom = map.getZoom();
 
-    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("href"), {
       lat: center.lat,
       lon: center.lng,
       zoom: zoom
-    }, openSidebar);    
+    });
   }
 }