Highlight search results when the mouse is over them

Fixes #748

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 81b96635b5bf62af654911bf7d5fc8f5e35bc429..61f4a3558673071f913bb11ca2519ebc797c6b36 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,3 +1,5 @@
+//= require jquery.simulate
+
 OSM.Search = function(map) {
   $(".search_form input[name=query]")
     .on("input", function(e) {
@@ -10,7 +12,18 @@ OSM.Search = function(map) {
 
   $("#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();
@@ -26,8 +39,35 @@ 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.minLon && data.minLat && data.maxLon && data.maxLat) {
@@ -36,13 +76,15 @@ OSM.Search = function(map) {
       map.setView(center, data.zoom);
     }
 
-    // Let clicks to object browser links propagate.
-    if (data.type && data.id) return;
-
-    marker.setLatLng(center).addTo(map);
-
     e.preventDefault();
     e.stopPropagation();
+
+    // Let clicks to object browser links propagate.
+    if (data.type && data.id) {
+      link.simulate("click", e);
+    } else {
+      marker.setLatLng(center).addTo(map);
+    }
   }
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 8ecaaf113bdad98a2d12d9cc8f87139caf4e9725..7c400b4f3c4b9f1c07bdcd13a73503f5c6ace706 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -969,7 +969,9 @@ header .search_form {
 .search_results_entry {
   ul li {
     border-bottom: $keyline;
+    cursor: pointer;
     &:first-child { border-top: $keyline; }
+    &.selected { background: #FFFFE6; }
   }
 
   .search_details {