Add sidebar loading indicator

[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 d881facbcc94e046ea425d571c9e81e8cfdbbeef..43142959b074d6c9586c238ea0bafc953e80063b 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,34 +1,45 @@
 OSM.Search = function(map) {
 OSM.Search = function(map) {

-  $("#query")
+  $(".search_form input[name=query]")

     .on("focus", function() {
     .on("focus", function() {

-      $("#describe_location").fadeOut(100);
+      $(".describe_location").fadeOut(100);

     })
     .on("blur", function() {
     })
     .on("blur", function() {

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

     });
 
     });
 

-  $("#sidebar_content").on("click", ".search_results_entry a.set_position", clickSearchResult);
+  $("#sidebar_content")
+    .on("click", ".search_more a", clickSearchMore)
+    .on("click", ".search_results_entry a.set_position", clickSearchResult);

 
 

-  function clickSearchResult(e) {
+  function clickSearchMore(e) {

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

+    e.stopPropagation();
+
+    var div = $(this).parents(".search_more");

 
 

+    $(this).hide();
+    div.find(".loader").show();
+
+    $.get($(this).attr("href"), function(data) {
+      div.replaceWith(data);
+    });
+  }
+
+  function clickSearchResult(e) {

     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) {
       map.fitBounds([[data.minLat, data.minLon],
         [data.maxLat, data.maxLon]]);
     } else {
       map.setView(center, data.zoom);
     }
     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()});
   }
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});


@@ -37,8 +48,8 @@ OSM.Search = function(map) {
 
   page.pushstate = page.popstate = function(path) {
     var params = querystring.parse(path.substring(path.indexOf('?') + 1));
 
   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() {
   };
 
   page.load = function() {


@@ -64,7 +75,7 @@ OSM.Search = function(map) {
   page.unload = function() {
     map.removeLayer(marker);
     map.removeObject();
   page.unload = function() {
     map.removeLayer(marker);
     map.removeObject();

-    $("#query").val("");
+    $(".search_form input[name=query]").val("");

   };
 
   return page;
   };
 
   return page;