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 3c1af5056ad57b06b4d615c5788000ca9262d861..b3ef3ceb3c13de3d4a7dbad7b4d8f7a313719000 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -9,16 +9,16 @@ OSM.Search = function (map) {
 
   $(".search_form a.btn.switch_link").on("click", function (e) {
     e.preventDefault();
 
   $(".search_form a.btn.switch_link").on("click", function (e) {
     e.preventDefault();

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

     let search = "";
     let search = "";

-    if (query) search = "?" + new URLSearchParams({ from: query });
+    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");
     OSM.router.route("/directions" + search + OSM.formatHash(map));
   });
 
   $(".search_form").on("submit", function (e) {
     e.preventDefault();
     $("header").addClass("closed");

-    var query = $(this).find("input[name=query]").val();
+    const query = $(this).find("input[name=query]").val();

     let search = "/";
     if (query) search = "/search?" + new URLSearchParams({ query });
     OSM.router.route(search + OSM.formatHash(map));
     let search = "/";
     if (query) search = "/search?" + new URLSearchParams({ query });
     OSM.router.route(search + OSM.formatHash(map));


@@ -38,35 +38,30 @@ OSM.Search = function (map) {
     .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult)
     .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult);
 
     .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult)
     .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"),
-        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));
   }
 
   function showSearchResult() {
     })
       .then(response => response.text())
       .then(data => div.replaceWith(data));
   }
 
   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() });
 


@@ -77,7 +72,7 @@ OSM.Search = function (map) {
   }
 
   function hideSearchResult() {
   }
 
   function hideSearchResult() {

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

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


@@ -93,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);
 


@@ -104,7 +99,7 @@ OSM.Search = function (map) {
     e.stopPropagation();
   }
 
     e.stopPropagation();
   }
 

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

 
   page.pushstate = page.popstate = function (path) {
     const params = new URLSearchParams(path.substring(path.indexOf("?")));
 
   page.pushstate = page.popstate = function (path) {
     const params = new URLSearchParams(path.substring(path.indexOf("?")));


@@ -120,27 +115,24 @@ OSM.Search = function (map) {
 
   page.load = function () {
     $(".search_results_entry").each(function (index) {
 
   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 = 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) {
           entry.html(html);
           // go to first result of first geocoder
           if (index === 0) {
       })
         .then(response => response.text())
         .then(function (html) {
           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());
             }