=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.73 retrieving revision 1.81 diff -u -p -r1.73 -r1.81 --- draft/form.min.js 2024/03/31 14:15:20 1.73 +++ draft/form.min.js 2024/03/31 15:02:32 1.81 @@ -1,40 +1,45 @@ const form = document.querySelector("#cform"); function validateEmail(email) { - var em = string.toLowerCase(); - // 1. max len = 96 - const regex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+(\.[a-zA-Z]{2,})+$/; - return regex.test(em); +/* + const regex = /^[a-z0-9._%+-]+@[a-z0-9.-]+(\.[a-z]{2,})+$/; + return regex.test(email); + */ }; function validateSubject(subject) { - // 1. remove special chars - // 2. min len = 4 - // 3. max len = 96 - return (subject.length>5); +/* + return (subject.length>3); + */ } function validateMsg(msg) { - // 1. remove special chars - // 2. min len = 4 - // 3. max len = 2048 - return (msg.length>5); +/* + return (msg.length>3); + */ } async function sendData() { + var error = 0, + info = document.getElementById("cfinfo"); + + if(er) { + info.textContent="One or more fields have an error. Please check and try again." + } else { + info.textContent="Please wait..." + } +/* var er = 0; - em = document.getElementById("cfem").value, - su = document.getElementById("cfsu").value, - ms = document.getElementById("cfme").value, - ii = document.getElementById("cfinfo"); + em = document.getElementById("cfem").value), + su = document.getElementById("cfsu").value), + ms = document.getElementById("cfme").value), + er=validateEmail(em)?er:++er; er=validateSubject(su)?er:++er; er=validateMsg(ms)?er:++er; if(er){ - ii.textContent="One or more fields have an error. Please check and try again."; } else { var fc = document.querySelectorAll(".wpcf7-form-control"); - ii.textContent="Please wait..."; fc.forEach((f) => { f.disabled=true; l=f; @@ -47,7 +52,6 @@ async function sendData() { 'response-field': false, retry: 'never', 'error-callback': function(e) { -// turnstile.remove(); ii.textContent="Cloudflare Turnstile verification error. Try again later." }, callback: function(token) { @@ -65,14 +69,16 @@ fetch("/feedbk/", { }) .then(response => response.json()) .then(json => ii.textContent=json['msg']) - }, }); - turnstile.remove(); + }); + turnstile.remove(); + turnstile.close(); } + */ }; form.addEventListener("submit", (event) => {