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

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index c32503e8e..6efba746e 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")
@@ -17,8 +17,8 @@ OSM.Search = function(map) {
 
     var div = $(this).parents(".search_more");
 
-    div.find(".search_results_entry").hide();
-    div.find(".search_searching").show();
+    $(this).hide();
+    div.find(".loader").show();
 
     $.get($(this).attr("href"), function(data) {
       div.replaceWith(data);
@@ -26,26 +26,20 @@ OSM.Search = function(map) {
   }
 
   function clickSearchResult(e) {
-    e.preventDefault();
-    e.stopPropagation();
-
     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]]);
     } else {
       map.setView(center, data.zoom);
     }
-
-    marker
-      .setLatLng(center)
-      .addTo(map);
-
-    if (data.type && data.id) {
-      map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } });
-    }
   }
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});
@@ -54,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() {
@@ -78,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;