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

[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 ea6140e582db78dea993eccdbde6eb1659124bb9..1c1da3677e167167eef8c9db1ba3db9b9d2b6ef4 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,7 +1,8 @@
-//= require jquery.simulate
+//= require jquery-simulate/jquery.simulate
+//= require qs/dist/qs

 
 

-OSM.Search = function(map) {
-  $(".search_form input[name=query]").on("input", function(e) {
+OSM.Search = function (map) {
+  $(".search_form input[name=query]").on("input", function (e) {

     if ($(e.target).val() === "") {
       $(".describe_location").fadeIn(100);
     } else {
     if ($(e.target).val() === "") {
       $(".describe_location").fadeIn(100);
     } else {


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

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

     e.preventDefault();
     var query = $(e.target).parent().parent().find("input[name=query]").val();
     if (query) {
     e.preventDefault();
     var query = $(e.target).parent().parent().find("input[name=query]").val();
     if (query) {


@@ -19,7 +20,7 @@ OSM.Search = function(map) {
     }
   });
 
     }
   });
 

-  $(".search_form").on("submit", function(e) {
+  $(".search_form").on("submit", function (e) {

     e.preventDefault();
     $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();
     e.preventDefault();
     $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();


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

-  $(".describe_location").on("click", function(e) {
+  $(".describe_location").on("click", function (e) {

     e.preventDefault();
     var center = map.getCenter().wrap(),
     e.preventDefault();
     var center = map.getCenter().wrap(),

-      precision = OSM.zoomPrecision(map.getZoom());
+        precision = OSM.zoomPrecision(map.getZoom());

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


@@ -42,12 +43,12 @@ OSM.Search = function(map) {
   $("#sidebar_content")
     .on("click", ".search_more a", clickSearchMore)
     .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)

-    .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 () {
+    .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) {
       var moved = false;
       $(this).one("click", function (e) {

-        if (!moved && !$(e.target).is('a')) {
+        if (!moved && !$(e.target).is("a")) {

           $(this).find("a.set_position").simulate("click", e);
         }
       }).one("mousemove", function () {
           $(this).find("a.set_position").simulate("click", e);
         }
       }).one("mousemove", function () {


@@ -55,17 +56,29 @@ OSM.Search = function(map) {
       });
     });
 
       });
     });
 

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

   function clickSearchMore(e) {
     e.preventDefault();
     e.stopPropagation();
 
   function clickSearchMore(e) {
     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);
+      }

     });
   }
 
     });
   }
 


@@ -75,7 +88,7 @@ OSM.Search = function(map) {
     if (!marker) {
       var data = $(this).find("a.set_position").data();
 
     if (!marker) {
       var data = $(this).find("a.set_position").data();
 

-      marker = L.marker([data.lat, data.lon], {icon: OSM.getUserIcon()});
+      marker = L.marker([data.lat, data.lon], { icon: OSM.getUserIcon() });

 
       $(this).data("marker", marker);
     }
 
       $(this).data("marker", marker);
     }


@@ -115,35 +128,37 @@ OSM.Search = function(map) {
     e.stopPropagation();
   }
 
     e.stopPropagation();
   }
 

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

   var page = {};
 
   var page = {};
 

-  page.pushstate = page.popstate = function(path) {
-    var params = querystring.parse(path.substring(path.indexOf('?') + 1));
+  page.pushstate = page.popstate = function (path) {
+    var params = Qs.parse(path.substring(path.indexOf("?") + 1));

     $(".search_form input[name=query]").val(params.query);
     $(".describe_location").hide();
     OSM.loadSidebarContent(path, page.load);
   };
 
     $(".search_form input[name=query]").val(params.query);
     $(".describe_location").hide();
     OSM.loadSidebarContent(path, page.load);
   };
 

-  page.load = function() {
-    $(".search_results_entry").each(function(index) {
-      var entry = $(this);
+  page.load = function () {
+    $(".search_results_entry").each(function (index) {
+      var entry = $(this),
+          csrf_param = $("meta[name=csrf-param]").attr("content"),
+          csrf_token = $("meta[name=csrf-token]").attr("content"),
+          params = {
+            zoom: map.getZoom(),
+            minlon: map.getBounds().getWest(),
+            minlat: map.getBounds().getSouth(),
+            maxlon: map.getBounds().getEast(),
+            maxlat: map.getBounds().getNorth()
+          };
+      params[csrf_param] = csrf_token;

       $.ajax({
         url: entry.data("href"),
       $.ajax({
         url: entry.data("href"),

-        method: 'GET',
-        data: {
-          zoom: map.getZoom(),
-          minlon: map.getBounds().getWest(),
-          minlat: map.getBounds().getSouth(),
-          maxlon: map.getBounds().getEast(),
-          maxlat: map.getBounds().getNorth()
-        },
-        success: function(html) {
+        method: "POST",
+        data: params,
+        success: function (html) {

           entry.html(html);
           // go to first result of first geocoder
           if (index === 0) {
           entry.html(html);
           // go to first result of first geocoder
           if (index === 0) {

-            var firstResult = entry.find('*[data-lat][data-lon]:first').first();
+            var firstResult = entry.find("*[data-lat][data-lon]:first").first();

             if (firstResult.length) {
               panToSearchResult(firstResult.data());
             }
             if (firstResult.length) {
               panToSearchResult(firstResult.data());
             }


@@ -155,7 +170,7 @@ OSM.Search = function(map) {
     return map.getState();
   };
 
     return map.getState();
   };
 

-  page.unload = function() {
+  page.unload = function () {

     markers.clearLayers();
     $(".search_form input[name=query]").val("");
     $(".describe_location").fadeIn(100);
     markers.clearLayers();
     $(".search_form input[name=query]").val("");
     $(".describe_location").fadeIn(100);