X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cdfe2ac21ec01344b4b10d566582e7cc2b2eb7cb..6fe824bd0ba20d997bb7d1b8627d79e209b61d03:/app/assets/javascripts/index/search.js

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index c97b6991d..61f4a3558 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,15 +1,29 @@
+//= require jquery.simulate
+
 OSM.Search = function(map) {
-  $("#query")
-    .on("focus", function() {
-      $("#describe_location").fadeOut(100);
+  $(".search_form input[name=query]")
+    .on("input", function(e) {
+      if ($(e.target).val() == "") {
+        $(".describe_location").fadeIn(100);
+      } else {
+        $(".describe_location").fadeOut(100);
+      }
     })
-    .on("blur", function() {
-      $("#describe_location").fadeIn(100);
-    });
 
   $("#sidebar_content")
     .on("click", ".search_more a", clickSearchMore)
-    .on("click", ".search_results_entry a.set_position", clickSearchResult);
+    .on("mouseover", "p.search_results_entry:has(a.set_position)", showSearchResult)
+    .on("mouseout", "p.search_results_entry:has(a.set_position)", hideSearchResult)
+    .on("mousedown", "p.search_results_entry:has(a.set_position)", function () {
+      var moved = false;
+      $(this).one("click", function (e) {
+        if (!moved && !$(e.target).is('a')) {
+          clickSearchResult(this, e);
+        }
+      }).one("mousemove", function () {
+        moved = true;
+      });
+    });
 
   function clickSearchMore(e) {
     e.preventDefault();
@@ -25,20 +39,51 @@ OSM.Search = function(map) {
     });
   }
 
-  function clickSearchResult(e) {
-    var data = $(this).data(),
+  function showSearchResult(e) {
+    var marker = $(this).data("marker");
+
+    if (!marker) {
+      var data = $(this).find("a.set_position").data();
+
+      marker = L.marker([data.lat, data.lon]);
+
+      $(this).data("marker", marker);
+    }
+
+    map.addLayer(marker);
+
+    $(this).closest("li").addClass("selected");
+  }
+
+  function hideSearchResult(e) {
+    var marker = $(this).data("marker");
+
+    if (marker) {
+      map.removeLayer(marker);
+    }
+
+    $(this).closest("li").removeClass("selected");
+  }
+
+  function clickSearchResult(result, e) {
+    var link = $(result).find("a.set_position"),
+      data = link.data(),
       center = L.latLng(data.lat, data.lon);
 
-    if (data.type && data.id) return; // Browse link
+    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);
+    }
 
     e.preventDefault();
     e.stopPropagation();
 
-    if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-      map.fitBounds([[data.minLat, data.minLon],
-        [data.maxLat, data.maxLon]]);
+    // Let clicks to object browser links propagate.
+    if (data.type && data.id) {
+      link.simulate("click", e);
     } else {
-      map.setView(center, data.zoom);
+      marker.setLatLng(center).addTo(map);
     }
   }
 
@@ -48,8 +93,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_content").load(path, page.load);
+    $(".search_form input[name=query]").val(params.query);
+    OSM.loadSidebarContent(path, page.load);
   };
 
   page.load = function() {
@@ -70,12 +115,15 @@ OSM.Search = function(map) {
         }
       });
     });
+
+    return map.getState();
   };
 
   page.unload = function() {
     map.removeLayer(marker);
     map.removeObject();
-    $("#query").val("");
+    $(".search_form input[name=query]").val("");
+    $(".describe_location").fadeIn(100);
   };
 
   return page;