Merge pull request #689 from mpourismaiel/fix/contact/formspree-async…

…-issue Fix formspree not working when asking for captcha
okkur · Jan 22, 2020 · 429a736 · 429a736
2 parents 0b03818 + 5084f3c
commit 429a736
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/assets/js/contact.js b/assets/js/contact.js
@@ -16,7 +16,7 @@ const validatorConfig = {
     $(`form[id=${form.getAttribute('id')}] .generic-error`).removeClass('d-none');
   },
   onSuccess: function(e, form) {
-    if (form.dataset.hasNetlify) {
+    if (form.dataset.hasNetlify || form.dataset.hasFormspree) {
       return;
     }
 

diff --git a/assets/js/helpers/jq-helpers.js b/assets/js/helpers/jq-helpers.js
@@ -140,9 +140,9 @@ $.ajax = function ajax({
     xhr.onreadystatechange = () => {
       if (xhr.readyState == 4) {
         if (xhr.status == 200) {
-            resolve(JSON.parse(xhr.responseXML || xhr.responseText));
+          resolve(JSON.parse(xhr.responseXML || xhr.responseText));
         } else {
-            reject(xhr.statusText);
+          reject(xhr.statusText);
         }
       }
     }

diff --git a/assets/scripts/syna-contact.js b/assets/scripts/syna-contact.js
diff --git a/layouts/partials/fragments/contact.html b/layouts/partials/fragments/contact.html
@@ -20,6 +20,9 @@
           {{- safeHTMLAttr (print " data-has-netlify=\"true\" netlify") -}}
         {{- else -}}
           {{- safeHTMLAttr (printf " action=\"%s\"" (.Params.post_url | default (printf "https://formspree.io/%s" .Params.email))) -}}
+        {{- end -}}
+        {{- if and (isset .Params "email") -}}
+          {{- safeHTMLAttr (print " data-has-formspree=\"true\"") -}}
         {{- end }}>
           <div class="row py-3 should-fade">
             <div class="col-md-6">