Merge remote-tracking branch 'upstream/pull/4960'

[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 b7bca1d2ac08e5dcb2f9ef31b23c0f36ef496845..2f3882e3ae126e9486d7a9fd6929e0b182365102 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,4 +1,3 @@
-//= require jquery-simulate/jquery.simulate

 //= require qs/dist/qs
 
 OSM.Search = function (map) {
 //= require qs/dist/qs
 
 OSM.Search = function (map) {


@@ -10,9 +9,9 @@ OSM.Search = function (map) {
     }
   });
 
     }
   });
 

-  $(".search_form a.button.switch_link").on("click", function (e) {
+  $(".search_form a.btn.switch_link").on("click", function (e) {

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

-    var query = $(e.target).parent().parent().find("input[name=query]").val();
+    var query = $(this).closest("form").find("input[name=query]").val();

     if (query) {
       OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map));
     } else {
     if (query) {
       OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map));
     } else {


@@ -34,27 +33,18 @@ OSM.Search = function (map) {
   $(".describe_location").on("click", function (e) {
     e.preventDefault();
     var center = map.getCenter().wrap(),
   $(".describe_location").on("click", function (e) {
     e.preventDefault();
     var center = map.getCenter().wrap(),

-        precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(
-      center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
-    ));
+        precision = OSM.zoomPrecision(map.getZoom()),
+        lat = center.lat.toFixed(precision),
+        lng = center.lng.toFixed(precision);
+
+    OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng));

   });
 
   $("#sidebar_content")
     .on("click", ".search_more a", clickSearchMore)
     .on("click", ".search_results_entry a.set_position", clickSearchResult)
     .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult)
   });
 
   $("#sidebar_content")
     .on("click", ".search_more a", clickSearchMore)
     .on("click", ".search_results_entry a.set_position", clickSearchResult)
     .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult)

-    .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult)
-    .on("mousedown", "li.search_results_entry:has(a.set_position)", function () {
-      var moved = false;
-      $(this).one("click", function (e) {
-        if (!moved && !$(e.target).is("a")) {
-          $(this).find("a.set_position").simulate("click", e);
-        }
-      }).one("mousemove", function () {
-        moved = true;
-      });
-    });
+    .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult);

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


@@ -62,13 +52,23 @@ OSM.Search = function (map) {
     e.preventDefault();
     e.stopPropagation();
 
     e.preventDefault();
     e.stopPropagation();
 

-    var div = $(this).parents(".search_more");
+    var div = $(this).parents(".search_more"),
+        csrf_param = $("meta[name=csrf-param]").attr("content"),
+        csrf_token = $("meta[name=csrf-token]").attr("content"),
+        params = {};

 
     $(this).hide();
     div.find(".loader").show();
 
 
     $(this).hide();
     div.find(".loader").show();
 

-    $.get($(this).attr("href"), function (data) {
-      div.replaceWith(data);
+    params[csrf_param] = csrf_token;
+
+    $.ajax({
+      url: $(this).attr("href"),
+      method: "POST",
+      data: params,
+      success: function (data) {
+        div.replaceWith(data);
+      }

     });
   }
 
     });
   }
 


@@ -84,8 +84,6 @@ OSM.Search = function (map) {
     }
 
     markers.addLayer(marker);
     }
 
     markers.addLayer(marker);

-
-    $(this).closest("li").addClass("selected");

   }
 
   function hideSearchResult() {
   }
 
   function hideSearchResult() {


@@ -94,8 +92,6 @@ OSM.Search = function (map) {
     if (marker) {
       markers.removeLayer(marker);
     }
     if (marker) {
       markers.removeLayer(marker);
     }

-
-    $(this).closest("li").removeClass("selected");

   }
 
   function panToSearchResult(data) {
   }
 
   function panToSearchResult(data) {