Fix translation interpolations

[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 89418e006c6c0772497d229e8f3299e192377dd4..3892d01a09939cc5c61f475ba88d45f3adbf6771 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,10 +1,10 @@
 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")
     });
 
   $("#sidebar_content")


@@ -17,8 +17,8 @@ OSM.Search = function(map) {
 
     var div = $(this).parents(".search_more");
 
 
     var div = $(this).parents(".search_more");
 

-    div.find(".search_results_entry").hide();
-    div.find(".search_searching").show();
+    $(this).hide();
+    div.find(".loader").show();

 
     $.get($(this).attr("href"), function(data) {
       div.replaceWith(data);
 
     $.get($(this).attr("href"), function(data) {
       div.replaceWith(data);


@@ -26,25 +26,22 @@ OSM.Search = function(map) {
   }
 
   function clickSearchResult(e) {
   }
 
   function clickSearchResult(e) {

-    e.preventDefault();
-

     var data = $(this).data(),
       center = L.latLng(data.lat, data.lon);
 
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
     var data = $(this).data(),
       center = L.latLng(data.lat, data.lon);
 
     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);
     }
 

-    marker
-      .setLatLng(center)
-      .addTo(map);
+    // Let clicks to object browser links propagate.
+    if (data.type && data.id) return;

 
 

-    if (data.type && data.id) {
-      map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } });
-    }
+    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()});


@@ -53,10 +50,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").removeClass("minimized");
-    map.invalidateSize();
-    $("#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() {


@@ -77,12 +72,14 @@ OSM.Search = function(map) {
         }
       });
     });
         }
       });
     });

+
+    return map.getState();

   };
 
   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;