Don't disable History button

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

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index dc4df821e8598e03d35b693c72c6251163859ae6..c546469db941a258ee72694481872f546d30b028 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -6,11 +6,13 @@ function initializeSearch(map) {
     $("#search_form").submit();
   }
 
     $("#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);
 
 
   $("#sidebar_content").on("click", ".search_results_entry a.set_position", clickSearchResult);
 


@@ -21,7 +23,6 @@ function initializeSearch(map) {
 
     var bounds = map.getBounds();
 
 
     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(),
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
       zoom: map.getZoom(),


@@ -31,8 +32,6 @@ function initializeSearch(map) {
       maxlat: bounds.getNorth()
     });
 
       maxlat: bounds.getNorth()
     });
 

-    openSidebar();
-

     $("#sidebar").one("closed", function () {
       map.removeLayer(marker);
       map.removeObject();
     $("#sidebar").one("closed", function () {
       map.removeLayer(marker);
       map.removeObject();


@@ -67,11 +66,10 @@ function initializeSearch(map) {
     var center = map.getCenter(),
       zoom = map.getZoom();
 
     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
     $("#sidebar_content").load($(this).attr("href"), {
       lat: center.lat,
       lon: center.lng,
       zoom: zoom

-    }, openSidebar);    
+    });

   }
 }
   }
 }