Resolve conflict

[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 fde4c249947a81e6e0f40b7dfac458b18cd98bd6..81b96635b5bf62af654911bf7d5fc8f5e35bc429 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,11 +1,12 @@
 OSM.Search = function(map) {
   $(".search_form input[name=query]")
 OSM.Search = function(map) {
   $(".search_form input[name=query]")

-    .on("focus", function() {
-      $(".describe_location").fadeOut(100);
+    .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)
 
   $("#sidebar_content")
     .on("click", ".search_more a", clickSearchMore)


@@ -29,17 +30,19 @@ OSM.Search = function(map) {
     var data = $(this).data(),
       center = L.latLng(data.lat, data.lon);
 
     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) {
     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);
     }
     } else {
       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();

   }
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});
   }
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});


@@ -49,13 +52,7 @@ OSM.Search = function(map) {
   page.pushstate = page.popstate = function(path) {
     var params = querystring.parse(path.substring(path.indexOf('?') + 1));
     $(".search_form input[name=query]").val(params.query);
   page.pushstate = page.popstate = function(path) {
     var params = querystring.parse(path.substring(path.indexOf('?') + 1));
     $(".search_form input[name=query]").val(params.query);

-    map.invalidateSize();
-    $("#sidebar_content").load(path, function(a, b, xhr) {
-      if (xhr.getResponseHeader('X-Page-Title')) {
-        document.title = xhr.getResponseHeader('X-Page-Title');
-      }
-      page.load();
-    });
+    OSM.loadSidebarContent(path, page.load);

   };
 
   page.load = function() {
   };
 
   page.load = function() {


@@ -76,12 +73,15 @@ OSM.Search = function(map) {
         }
       });
     });
         }
       });
     });

+
+    return map.getState();

   };
 
   page.unload = function() {
     map.removeLayer(marker);
     map.removeObject();
     $(".search_form input[name=query]").val("");
   };
 
   page.unload = function() {
     map.removeLayer(marker);
     map.removeObject();
     $(".search_form input[name=query]").val("");

+    $(".describe_location").fadeIn(100);

   };
 
   return page;
   };
 
   return page;