Merge branch 'main' into turbo-7-2-0

* main: Don't assume fetchOptions has a `body` (#384)
hotwired · Sep 19, 2022 · 8cdacc1 · 8cdacc1
2 parents 48d0731 + fb519d5
commit 8cdacc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/javascripts/turbo.js b/app/assets/javascripts/turbo.js
@@ -3996,7 +3996,7 @@ function encodeMethodIntoRequestBody(event) {
   if (event.target instanceof HTMLFormElement) {
     const {target: form, detail: {fetchOptions: fetchOptions}} = event;
     form.addEventListener("turbo:submit-start", (({detail: {formSubmission: {submitter: submitter}}}) => {
-      const method = submitter && submitter.formMethod || fetchOptions.body.get("_method") || form.getAttribute("method");
+      const method = submitter && submitter.formMethod || fetchOptions.body && fetchOptions.body.get("_method") || form.getAttribute("method");
       if (!/get/i.test(method)) {
         if (/post/i.test(method)) {
           fetchOptions.body.delete("_method");

diff --git a/app/javascript/turbo/fetch_requests.js b/app/javascript/turbo/fetch_requests.js
@@ -3,7 +3,7 @@ export function encodeMethodIntoRequestBody(event) {
     const { target: form, detail: { fetchOptions } } = event
 
     form.addEventListener("turbo:submit-start", ({ detail: { formSubmission: { submitter } } }) => {
-      const method = (submitter && submitter.formMethod) || fetchOptions.body.get("_method") || form.getAttribute("method")
+      const method = (submitter && submitter.formMethod) || (fetchOptions.body && fetchOptions.body.get("_method")) || form.getAttribute("method")
 
       if (!/get/i.test(method)) {
         if (/post/i.test(method)) {