X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bc27347b8f8333b65962b8c00f76dc99a1095a8a..bdbc1d663d04075f45a87a4b78b0744a008d758c:/app/assets/javascripts/index/search.js

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index b9e86a4c3..6b6f3231f 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,10 +1,10 @@
 OSM.Search = function(map) {
-  $("#query")
+  $(".search_form input[name=query]")
     .on("focus", function() {
-      $("#describe_location").fadeOut(100);
+      $(".describe_location").fadeOut(100);
     })
     .on("blur", function() {
-      $("#describe_location").fadeIn(100);
+      $(".describe_location").fadeIn(100);
     });
 
   $("#sidebar_content")
@@ -29,17 +29,17 @@ OSM.Search = function(map) {
     var data = $(this).data(),
       center = L.latLng(data.lat, data.lon);
 
-    if (data.type && data.id) return; // Browse link
-
-    e.preventDefault();
-    e.stopPropagation();
-
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-      map.fitBounds([[data.minLat, data.minLon],
-        [data.maxLat, data.maxLon]]);
+      map.fitBounds([[data.minLat, data.minLon], [data.maxLat, data.maxLon]]);
     } else {
       map.setView(center, data.zoom);
     }
+
+    // Let clicks to object browser links propagate.
+    if (data.type && data.id) return;
+
+    e.preventDefault();
+    e.stopPropagation();
   }
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});
@@ -48,10 +48,8 @@ OSM.Search = function(map) {
 
   page.pushstate = page.popstate = function(path) {
     var params = querystring.parse(path.substring(path.indexOf('?') + 1));
-    $("#query").val(params.query);
-    $("#sidebar").removeClass("minimized");
-    map.invalidateSize();
-    $("#sidebar_content").load(path, page.load);
+    $(".search_form input[name=query]").val(params.query);
+    OSM.loadSidebarContent(path, page.load);
   };
 
   page.load = function() {
@@ -72,12 +70,14 @@ OSM.Search = function(map) {
         }
       });
     });
+
+    return map.getState();
   };
 
   page.unload = function() {
     map.removeLayer(marker);
     map.removeObject();
-    $("#query").val("");
+    $(".search_form input[name=query]").val("");
   };
 
   return page;