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 42294576b7bb0fba584a1c181107b9c66f06db7a..b3ef3ceb3c13de3d4a7dbad7b4d8f7a313719000 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -11,7 +11,7 @@ OSM.Search = function (map) {
     e.preventDefault();
     const query = $(this).closest("form").find("input[name=query]").val();
     let search = "";
     e.preventDefault();
     const query = $(this).closest("form").find("input[name=query]").val();
     let search = "";

-    if (query) search = "?" + new URLSearchParams({ from: query });
+    if (query) search = "?" + new URLSearchParams({ to: query });

     OSM.router.route("/directions" + search + OSM.formatHash(map));
   });
 
     OSM.router.route("/directions" + search + OSM.formatHash(map));
   });
 


@@ -44,19 +44,14 @@ OSM.Search = function (map) {
     e.preventDefault();
     e.stopPropagation();
 
     e.preventDefault();
     e.stopPropagation();
 

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

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

-    params.set(csrf_param, csrf_token);
-

     fetch($(this).attr("href"), {
       method: "POST",
     fetch($(this).attr("href"), {
       method: "POST",

-      body: params
+      body: new URLSearchParams(OSM.csrf)

     })
       .then(response => response.text())
       .then(data => div.replaceWith(data));
     })
       .then(response => response.text())
       .then(data => div.replaceWith(data));


@@ -120,20 +115,17 @@ OSM.Search = function (map) {
 
   page.load = function () {
     $(".search_results_entry").each(function (index) {
 
   page.load = function () {
     $(".search_results_entry").each(function (index) {

-      const entry = $(this),
-            csrf_param = $("meta[name=csrf-param]").attr("content"),
-            csrf_token = $("meta[name=csrf-token]").attr("content"),
-            params = new URLSearchParams({
-              zoom: map.getZoom(),
-              minlon: map.getBounds().getWest(),
-              minlat: map.getBounds().getSouth(),
-              maxlon: map.getBounds().getEast(),
-              maxlat: map.getBounds().getNorth()
-            });
-      params.set(csrf_param, csrf_token);
+      const entry = $(this);

       fetch(entry.data("href"), {
         method: "POST",
       fetch(entry.data("href"), {
         method: "POST",

-        body: params
+        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) {
       })
         .then(response => response.text())
         .then(function (html) {