Cache csrf properties

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

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


@@ -10,73 +7,61 @@ 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();
-    if (query) {
-      OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map));
-    } else {
-      OSM.router.route("/directions" + OSM.formatHash(map));
-    }
+    const query = $(this).closest("form").find("input[name=query]").val();
+    let search = "";
+    if (query) search = "?" + new URLSearchParams({ to: query });
+    OSM.router.route("/directions" + search + OSM.formatHash(map));

   });
 
   $(".search_form").on("submit", function (e) {
     e.preventDefault();
     $("header").addClass("closed");
   });
 
   $(".search_form").on("submit", function (e) {
     e.preventDefault();
     $("header").addClass("closed");

-    var query = $(this).find("input[name=query]").val();
-    if (query) {
-      OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
-    } else {
-      OSM.router.route("/" + OSM.formatHash(map));
-    }
+    const query = $(this).find("input[name=query]").val();
+    let search = "/";
+    if (query) search = "/search?" + new URLSearchParams({ query });
+    OSM.router.route(search + OSM.formatHash(map));

   });
 
   $(".describe_location").on("click", function (e) {
     e.preventDefault();
   });
 
   $(".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)
-    ));
+    $("header").addClass("closed");
+    const [lat, lon] = OSM.cropLocation(map.getCenter(), map.getZoom());
+
+    OSM.router.route("/search?" + new URLSearchParams({ lat, lon }));

   });
 
   $("#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);
+  const 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");
+    const div = $(this).parents(".search_more");

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

-    $.get($(this).attr("href"), function (data) {
-      div.replaceWith(data);
-    });
+    fetch($(this).attr("href"), {
+      method: "POST",
+      body: new URLSearchParams(OSM.csrf)
+    })
+      .then(response => response.text())
+      .then(data => div.replaceWith(data));

   }
 
   function showSearchResult() {
   }
 
   function showSearchResult() {

-    var marker = $(this).data("marker");
+    let marker = $(this).data("marker");

 
     if (!marker) {
 
     if (!marker) {

-      var data = $(this).find("a.set_position").data();
+      const 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() });
 


@@ -84,18 +69,14 @@ OSM.Search = function (map) {
     }
 
     markers.addLayer(marker);
     }
 
     markers.addLayer(marker);

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

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

-    var marker = $(this).data("marker");
+    const marker = $(this).data("marker");

 
     if (marker) {
       markers.removeLayer(marker);
     }
 
     if (marker) {
       markers.removeLayer(marker);
     }

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

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


@@ -107,7 +88,7 @@ OSM.Search = function (map) {
   }
 
   function clickSearchResult(e) {
   }
 
   function clickSearchResult(e) {

-    var data = $(this).data();
+    const data = $(this).data();

 
     panToSearchResult(data);
 
 
     panToSearchResult(data);
 


@@ -118,43 +99,45 @@ OSM.Search = function (map) {
     e.stopPropagation();
   }
 
     e.stopPropagation();
   }
 

-  var page = {};
+  const page = {};

 
   page.pushstate = page.popstate = function (path) {
 
   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();
+    const params = new URLSearchParams(path.substring(path.indexOf("?")));
+    if (params.has("query")) {
+      $(".search_form input[name=query]").val(params.get("query"));
+      $(".describe_location").hide();
+    } else if (params.has("lat") && params.has("lon")) {
+      $(".search_form input[name=query]").val(params.get("lat") + ", " + params.get("lon"));
+      $(".describe_location").hide();
+    }

     OSM.loadSidebarContent(path, page.load);
   };
 
   page.load = function () {
     $(".search_results_entry").each(function (index) {
     OSM.loadSidebarContent(path, page.load);
   };
 
   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"),
+      const entry = $(this);
+      fetch(entry.data("href"), {

         method: "POST",
         method: "POST",

-        data: params,
-        success: function (html) {
+        body: new URLSearchParams({
+          zoom: map.getZoom(),
+          minlon: map.getBounds().getWest(),
+          minlat: map.getBounds().getSouth(),
+          maxlon: map.getBounds().getEast(),
+          maxlat: map.getBounds().getNorth(),
+          ...OSM.csrf
+        })
+      })
+        .then(response => response.text())
+        .then(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();
+            const firstResult = entry.find("*[data-lat][data-lon]:first").first();

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

-        }
-      });
+        });

     });
 
     return map.getState();
     });
 
     return map.getState();