Allow query mode to be disabled when the sidebar is open

[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 bd688b550eff90a6bc4c95e6877100885e406eaf..e9f06ddf071ab109462b7163c2aec7e51cb1c9e8 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -12,13 +12,14 @@ OSM.Search = function(map) {
 
   $("#sidebar_content")
     .on("click", ".search_more a", clickSearchMore)
 
   $("#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')) {
     .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);
+          $(this).find("a.set_position").simulate("click", e);

         }
       }).one("mousemove", function () {
         moved = true;
         }
       }).one("mousemove", function () {
         moved = true;


@@ -65,9 +66,8 @@ OSM.Search = function(map) {
     $(this).closest("li").removeClass("selected");
   }
 
     $(this).closest("li").removeClass("selected");
   }
 

-  function clickSearchResult(result, e) {
-    var link = $(result).find("a.set_position"),
-      data = link.data(),
+  function clickSearchResult(e) {
+    var data = $(this).data(),

       center = L.latLng(data.lat, data.lon);
 
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
       center = L.latLng(data.lat, data.lon);
 
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {


@@ -76,13 +76,11 @@ OSM.Search = function(map) {
       map.setView(center, data.zoom);
     }
 
       map.setView(center, data.zoom);
     }
 

+    // Let clicks to object browser links propagate.
+    if (data.type && data.id) return;
+

     e.preventDefault();
     e.stopPropagation();
     e.preventDefault();
     e.stopPropagation();

-
-    // Let clicks to object browser links propagate.
-    if (data.type && data.id) {
-      link.simulate("click", e);
-    }

   }
 
   var markers = L.layerGroup().addTo(map);
   }
 
   var markers = L.layerGroup().addTo(map);