From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 2 Oct 2013 18:22:56 +0000 (-0700)
Subject: Don't autofocus search, fade out "Where am I?" on focus
X-Git-Tag: live~4621^2~240
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d3bf4149e09053436d8d266952c49bb8f7ef6946

Don't autofocus search, fade out "Where am I?" on focus
---

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index ce00fa0af..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);
 
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 55953f004..701922486 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -8,8 +8,7 @@
       <%= submit_tag t('site.search.submit_text') %>
       <div id='query_wrapper'>
         <%= text_field_tag :query, params[:query],
-                           :placeholder => t('site.search.search'),
-                           :autofocus => "autofocus" %>
+                           :placeholder => t('site.search.search') %>
         <%= link_to t('site.search.where_am_i'),
                     { :controller => :geocoder, :action => :description },
                     { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>