Move jquery .load() to fetch

diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js
index 937d9b0528127754462ac1b71874446507f4712d..45d22feede8f2eec566bbd05a996d195410b4327 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -16,7 +16,10 @@ L.OSM.key = function (options) {
 
     function shown() {
       map.on("zoomend baselayerchange", update);
-      $section.load("/key", update);
+      fetch("/key")
+        .then(r => r.text())
+        .then(html => { $section.html(html); })
+        .then(update);
     }
 
     function hidden() {

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index eb13392eb5039c22b9694d10810748d199cb715f..d4b59cadc8241047b2520f9a4831514ba18d9599 100644 (file)
--- a/app/assets/javascripts/richtext.js
+++ b/app/assets/javascripts/richtext.js
@@ -36,9 +36,15 @@
     if (preview.children(".richtext").contents().length === 0) {
       preview.children(".richtext_placeholder").removeAttr("hidden").addClass("delayed-fade-in");
 
-      preview.children(".richtext").load(editor.data("previewUrl"), { text: editor.val() }, function () {
-        preview.children(".richtext_placeholder").attr("hidden", true).removeClass("delayed-fade-in");
-      });
+      fetch(editor.data("previewUrl"), {
+        method: "POST",
+        body: new URLSearchParams({ text: editor.val(), ...OSM.csrf })
+      })
+        .then(r => r.text())
+        .then(html => {
+          preview.children(".richtext").html(html);
+          preview.children(".richtext_placeholder").attr("hidden", true).removeClass("delayed-fade-in");
+        });
     }
   });
 

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 2af9e18cbd06b37b2e9f8165bc2aad7baae08ce4..9d225a85979c1266c699c76ffe17a303cc503fe3 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -210,10 +210,10 @@ $(document).ready(function () {
   });
 
   $("input[name=legale]").change(function () {
-    const url = $(this).data("url");
-
     $("#contributorTerms").html("<div class='spinner-border' role='status'><span class='visually-hidden'>" + I18n.t("browse.start_rjs.loading") + "</span></div>");
-    $("#contributorTerms").load(url);
+    fetch($(this).data("url"))
+      .then(r => r.text())
+      .then(html => { $("#contributorTerms").html(html); });
   });
 
   $("#read_ct").on("click", function () {