===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.1
retrieving revision 1.16
diff -u -p -r1.1 -r1.16
--- draft/form.min.js	2024/03/27 20:37:50	1.1
+++ draft/form.min.js	2024/03/28 06:59:46	1.16
@@ -15,9 +15,9 @@ function validateMsg(msg) {
 
 async function sendData() {
 	var er = 0;
-		em = document.getElementById("yemail").value,
-		su = document.getElementById("ysub").value,
-		ms = document.getElementById("ymsg").value,
+		em = document.getElementById("cfem").value,
+		su = document.getElementById("cfsu").value,
+		ms = document.getElementById("cfme").value,
 		ii = document.getElementById("cfinfo");
 	
 	er=validateEmail(em)?er:++er;
@@ -26,7 +26,28 @@ async function sendData() {
 	if(er){
 		ii.textContent="One or more fields have an error. Please check and try again.";
 	} else {
-		ii.textContent="All good."
+		var fc = document.querySelectorAll(".wpcf7-form-control");
+		ii.textContent="All good.";
+		fc.forEach((f) => {
+    		f.disabled=true;
+			l=f;
+		});
+		l.style.visibility="hidden";
+
+	turnstile.ready(function() {						
+   	turnstile.render('#cfcontainer', {
+		theme: 'light',
+        sitekey: '0x4AAAAAAAVpXFEy152AON1L',
+		'error-callback': function(e) {
+			turnstile.remove();
+		},
+        callback: function(token) {
+			ii.textContent="Sent";
+           console.log(`Challenge Success ${token}`);
+       },
+   	});	
+});			
+		
 	}
 };
 
@@ -34,40 +55,6 @@ form.addEventListener("submit", (event) => {
 	event.preventDefault();
 	sendData();
 });
-
-//	turnstile.ready(function() {		
-//		var e = document.querySelectorAll(".wpcf7-form-control"),
-//			b = document.getElementById("wpcf7-button");
-//		e.forEach((f) => {
- //   		f.disabled=true;
-//		});
-//		b.value="ONE OR MORE FIELDS HAVE AN ERROR. PLEASE CHECK AND TRY AGAIN";
-		
-		// ONE OR MORE FIELDS HAVE AN ERROR. PLEASE CHECK AND TRY AGAIN.
-		
-//		document.getElementById("wp1").disabled=true;
-		
-//		document.getElementById("wpcf7-button").disabled=true;
-//		document.getElementById("wpcf7-button").value="Please wait..."
-		
- //   	turnstile.render('#cfcontainer', {
-//		theme: 'light',
- //       sitekey: '0x4AAAAAAAVpXFEy152AON1L',
-//		'error-callback': function(e) {
-//			turnstile.remove();
-//			b.value=e;
-//		},
- //       callback: function(token) {
-//			b.value="Sending...";
-//           console.log(`Challenge Success ${token}`);
-			
-//		   document.getElementById("wpcf7-button").disabled=true;
-//		   document.getElementById("wpcf7-button").type="hidden";
-		
- //       },
- //   	});
-		
-//});
 	
   // Associate the FormData object with the form element
  // const formData = new FormData(form);