← All changes | js/formidable.js +545 -1373 6.32.1 → 6.13 View file →

		@@ -1,9 +1,14 @@
1		-/* exported frmRecaptcha, frmAfterRecaptcha */
	1	+/* exported frmRecaptcha, frmAfterRecaptcha, frmUpdateField */
	2	+/* eslint-disable prefer-const */
2	3
3	4	function frmFrontFormJS() {
4	5	'use strict';
5	6
	7	+ /*global jQuery:false, frm_js, grecaptcha, hcaptcha, turnstile, frmProForm, tinyMCE */
	8	+ /*global frmThemeOverride_jsErrors, frmThemeOverride_frmPlaceError, frmThemeOverride_frmAfterSubmit */
	9	+
	10	+ let action = '';
6	11	let jsErrors = [];
7	12
8	13	/**
9	14	* Triggers custom JS event.
		@@ -11,9 +16,9 @@
11	16	* @since 5.5.3
12	17	*
13	18	* @param {HTMLElement} el The HTML element.
14	19	* @param {string} eventName Event name.
15		- * @param {*} data The passed data.
	20	+ * @param {mixed} data The passed data.
16	21	*/
17	22	function triggerCustomEvent( el, eventName, data ) {
18	23	if ( typeof window.CustomEvent !== 'function' ) {
19	24	return;
		@@ -24,35 +29,31 @@
24	29
25	30	el.dispatchEvent( event );
26	31	}
27	32
28		- /**
29		- * Get the ID of the field that changed.
30		- *
31		- * @param {HTMLElement|jQuery} field
32		- * @param {boolean} fullID
33		- * @return {string|number} Field ID.
34		- */
	33	+ /* Get the ID of the field that changed*/
35	34	function getFieldId( field, fullID ) {
36		- let nameParts;
37		- let fieldId;
38		- let isRepeating = false;
39		- let fieldName = '';
40		-
	35	+ let nameParts, fieldId,
	36	+ isRepeating = false,
	37	+ fieldName = '';
41	38	if ( field instanceof jQuery ) {
42		- field = field.get( 0 );
	39	+ fieldName = field.attr( 'name' );
	40	+ } else {
	41	+ fieldName = field.name;
43	42	}
44	43
45		- fieldName = field.name;
46		-
47		- if ( fieldName === undefined ) {
	44	+ if ( typeof fieldName === 'undefined' ) {
48	45	fieldName = '';
49	46	}
50	47
51	48	if ( fieldName === '' ) {
52		- fieldName = field.getAttribute( 'data-name' );
	49	+ if ( field instanceof jQuery ) {
	50	+ fieldName = field.data( 'name' );
	51	+ } else {
	52	+ fieldName = field.getAttribute( 'data-name' );
	53	+ }
53	54
54		- if ( fieldName === undefined ) {
	55	+ if ( typeof fieldName === 'undefined' ) {
55	56	fieldName = '';
56	57	}
57	58
58	59	if ( fieldName !== '' && fieldName ) {
		@@ -67,24 +68,25 @@
67	68	return 0;
68	69	}
69	70	nameParts = nameParts.filter( function( n ) {
70	71	return n !== '';
71		- } );
	72	+ });
72	73
73		- fieldId = nameParts[ 0 ];
	74	+ fieldId = nameParts[0];
74	75
75	76	if ( nameParts.length === 1 ) {
76	77	return fieldId;
77	78	}
78	79
79		- if ( nameParts[ 1 ] === '[form' || nameParts[ 1 ] === '[row_ids' ) {
	80	+ if ( nameParts[1] === '[form' || nameParts[1] === '[row_ids' ) {
80	81	return 0;
81	82	}
82	83
83	84	// Check if 'this' is in a repeating section
84		- if ( document.querySelector( `input[name="item_meta[${ fieldId }][form]"]` ) ) {
	85	+ if ( jQuery( 'input[name="item_meta[' + fieldId + '][form]"]' ).length ) {
	86	+
85	87	// this is a repeatable section with name: item_meta[repeating-section-id][row-id][field-id]
86		- fieldId = nameParts[ 2 ].replace( '[', '' );
	88	+ fieldId = nameParts[2].replace( '[', '' );
87	89	isRepeating = true;
88	90	}
89	91
90	92	// Check if 'this' is an other text field and get field ID for it
		@@ -90,21 +92,21 @@
90	92	// Check if 'this' is an other text field and get field ID for it
91	93	if ( 'other' === fieldId ) {
92	94	if ( isRepeating ) {
93	95	// name for other fields: item_meta[370][0][other][414]
94		- fieldId = nameParts[ 3 ].replace( '[', '' );
	96	+ fieldId = nameParts[3].replace( '[', '' );
95	97	} else {
96	98	// Other field name: item_meta[other][370]
97		- fieldId = nameParts[ 1 ].replace( '[', '' );
	99	+ fieldId = nameParts[1].replace( '[', '' );
98	100	}
99	101	}
100	102
101	103	if ( fullID === true ) {
102	104	// For use in the container div id
103		- if ( fieldId === nameParts[ 0 ] ) {
104		- fieldId = `${ fieldId }-${ nameParts[ 1 ].replace( '[', '' ) }`;
	105	+ if ( fieldId === nameParts[0]) {
	106	+ fieldId = fieldId + '-' + nameParts[1].replace( '[', '' );
105	107	} else {
106		- fieldId = `${ fieldId }-${ nameParts[ 0 ] }-${ nameParts[ 1 ].replace( '[', '' ) }`;
	108	+ fieldId = fieldId + '-' + nameParts[0] + '-' + nameParts[1].replace( '[', '' );
107	109	}
108	110	}
109	111
110	112	return fieldId;
		@@ -117,15 +119,9 @@
117	119	*
118	120	* @param {Object} $form
119	121	*/
120	122	function disableSubmitButton( $form ) {
121		- const form = $form instanceof jQuery ? $form.get( 0 ) : $form;
122		- if ( ! form ) {
123		- return;
124		- }
125		- form.querySelectorAll( 'input[type="submit"], input[type="button"], button[type="submit"], button.frm_save_draft' ).forEach(
126		- button => button.disabled = true
127		- );
	123	+ $form.find( 'input[type="submit"], input[type="button"], button[type="submit"], button.frm_save_draft' ).attr( 'disabled', 'disabled' );
128	124	}
129	125
130	126	/**
131	127	* Enable the submit button for a given jQuery form object
		@@ -131,16 +127,12 @@
131	127	* Enable the submit button for a given jQuery form object
132	128	*
133	129	* @since 2.03.02
134	130	*
135		- * @param {HTMLElement} form
136		- *
137		- * @return {void}
	131	+ * @param {Object} $form
138	132	*/
139		- function enableSubmitButton( form ) {
140		- form.querySelectorAll( 'input[type="submit"], input[type="button"], button[type="submit"]' ).forEach(
141		- button => button.disabled = false
142		- );
	133	+ function enableSubmitButton( $form ) {
	134	+ $form.find( 'input[type="submit"], input[type="button"], button[type="submit"]' ).prop( 'disabled', false );
143	135	}
144	136
145	137	/**
146	138	* Disable the save draft link for a given jQuery form object
		@@ -149,93 +141,65 @@
149	141	*
150	142	* @param {Object} $form
151	143	*/
152	144	function disableSaveDraft( $form ) {
153		- const form = $form instanceof jQuery ? $form.get( 0 ) : $form;
154		- if ( ! form ) {
155		- return;
156		- }
157		- form.querySelectorAll( 'a.frm_save_draft' ).forEach(
158		- link => link.style.pointerEvents = 'none'
159		- );
	145	+ $form.find( 'a.frm_save_draft' ).css( 'pointer-events', 'none' );
160	146	}
161	147
162	148	/**
163		- * Enable the save draft link for a given form object.
	149	+ * Enable the save draft link for a given jQuery form object
164	150	*
165	151	* @since 4.04.03
166	152	*
167		- * @param {jQuery|HTMLElement} $form
	153	+ * @param {Object} $form
168	154	*/
169	155	function enableSaveDraft( $form ) {
170		- const form = $form instanceof jQuery ? $form.get( 0 ) : $form;
171		- if ( ! form ) {
	156	+ if ( ! $form.length ) {
172	157	return;
173	158	}
174		- form.querySelectorAll( '.frm_save_draft' ).forEach( saveDraftButton => {
175		- saveDraftButton.disabled = false;
	159	+ $form[0].querySelectorAll( '.frm_save_draft' ).forEach( saveDraftButton => {
	160	+ saveDraftButton.disabled = false;
176	161	saveDraftButton.style.pointerEvents = '';
177		- } );
	162	+ });
178	163	}
179	164
180		- /**
181		- * Validate form with JS.
182		- *
183		- * @param {HTMLElement|jQuery} object
184		- * @return {Array} Errors.
185		- */
186	165	function validateForm( object ) {
187		- let errors = [];
	166	+ let errors, r, rl, n, nl, fields, field, requiredFields;
188	167
189		- const vanillaJsObject = 'function' === typeof object.get ? object.get( 0 ) : object;
	168	+ errors = [];
190	169
191		- // Required field validation.
192		- vanillaJsObject?.querySelectorAll( '.frm_required_field' ).forEach(
193		- requiredField => {
194		- const isVisible = requiredField.offsetParent !== null;
195		- if ( ! isVisible ) {
196		- return;
	170	+ // Make sure required text field is filled in
	171	+ requiredFields = jQuery( object ).find(
	172	+ '.frm_required_field:visible input, .frm_required_field:visible select, .frm_required_field:visible textarea'
	173	+ ).filter( ':not(.frm_optional)' );
	174	+ if ( requiredFields.length ) {
	175	+ for ( r = 0, rl = requiredFields.length; r < rl; r++ ) {
	176	+ if ( hasClass( requiredFields[r], 'ed_button' ) ) {
	177	+ // skip rich text field buttons.
	178	+ continue;
197	179	}
198		-
199		- requiredField.querySelectorAll( 'input, select, textarea' ).forEach(
200		- requiredInput => {
201		- if ( hasClass( requiredInput, 'frm_optional' ) || hasClass( requiredInput, 'ed_button' ) ) {
202		- // skip rich text field buttons.
203		- return;
204		- }
205		-
206		- errors = checkRequiredField( requiredInput, errors );
207		- }
208		- );
	180	+ errors = checkRequiredField( requiredFields[r], errors );
209	181	}
210		- );
	182	+ }
211	183
212		- vanillaJsObject?.querySelectorAll( 'input,select,textarea' ).forEach(
213		- field => {
	184	+ fields = jQuery( object ).find( 'input,select,textarea' );
	185	+ if ( fields.length ) {
	186	+ for ( n = 0, nl = fields.length; n < nl; n++ ) {
	187	+ field = fields[n];
214	188	if ( '' === field.value ) {
215	189	if ( 'number' === field.type ) {
216	190	// A number field will return an empty string when it is invalid.
217	191	checkValidity( field, errors );
218	192	}
219		-
220		- const isConfirmationField = field.name && 0 === field.name.indexOf( 'item_meta[conf_' );
221		- if ( ! isConfirmationField ) {
222		- // Allow a blank confirmation field to still call validateFieldValue.
223		- // If we continue for a confirmation field there are issues with forms submitting with a blank confirmation field.
224		- return;
225		- }
	193	+ continue;
226	194	}
227	195
228		- validateFieldValue( field, errors, true );
	196	+ validateFieldValue( field, errors );
229	197	checkValidity( field, errors );
230	198	}
231		- );
	199	+ }
232	200
233		- // Invisible captchas are processed after validation.
234		- // We only want to validate a visible captcha on submit.
235		- if ( ! hasInvisibleRecaptcha( object ) ) {
236		- errors = validateRecaptcha( object, errors );
237		- }
	201	+ errors = validateRecaptcha( object, errors );
238	202
239	203	return errors;
240	204	}
241	205
		@@ -247,14 +211,15 @@
247	211	* @param {Array} errors
248	212	* @return {void}
249	213	*/
250	214	function checkValidity( field, errors ) {
	215	+ let fieldID;
251	216	if ( 'object' !== typeof field.validity || false !== field.validity.valid ) {
252	217	return;
253	218	}
254	219
255		- const fieldID = getFieldId( field, true );
256		- if ( errors[ fieldID ] === undefined ) {
	220	+ fieldID = getFieldId( field, true );
	221	+ if ( 'undefined' === typeof errors[ fieldID ]) {
257	222	errors[ fieldID ] = getFieldValidationMessage( field, 'data-invmsg' );
258	223	}
259	224
260	225	if ( 'function' === typeof field.reportValidity ) {
		@@ -273,100 +238,55 @@
273	238	function hasClass( element, targetClass ) {
274	239	return element.classList && element.classList.contains( targetClass );
275	240	}
276	241
277		- /**
278		- * @param {HTMLElement} field
279		- */
280	242	function maybeValidateChange( field ) {
281	243	if ( field.type === 'url' ) {
282		- maybeAddHttpsToUrl( field );
	244	+ maybeAddHttpToUrl( field );
283	245	}
284		- const form = field.closest( 'form' );
285		- if ( ! form ) {
286		- return;
	246	+ if ( jQuery( field ).closest( 'form' ).hasClass( 'frm_js_validate' ) ) {
	247	+ validateField( field );
287	248	}
288		-
289		- // Removing stale errors is universal. Adding errors only happens when JS validation is enabled.
290		- validateField( field, hasClass( form, 'frm_js_validate' ) );
291	249	}
292	250
293		- /**
294		- * @param {HTMLElement} field
295		- */
296		- function maybeAddHttpsToUrl( field ) {
	251	+ function maybeAddHttpToUrl( field ) {
297	252	const url = field.value;
298	253	const matches = url.match( /^(https?|ftps?|mailto|news|feed|telnet):/ );
299	254	if ( field.value !== '' && matches === null ) {
300		- field.value = `https://${ url }`;
	255	+ field.value = 'http://' + url;
301	256	}
302	257	}
303	258
304		- /**
305		- * Validate a field with JS.
306		- *
307		- * Removing stale errors is universal. Adding errors only happens when JS validation is enabled.
308		- *
309		- * @since 6.32 Added the `addErrors` parameter.
310		- *
311		- * @param {HTMLElement} field
312		- * @param {boolean} addErrors Whether to add new errors. Defaults to `true`.
313		- *
314		- * @return {void}
315		- */
316		- function validateField( field, addErrors = true ) {
317		- let errors;
318		- let key;
	259	+ function validateField( field ) {
	260	+ let key,
	261	+ errors = [],
	262	+ $fieldCont = jQuery( field ).closest( '.frm_form_field' );
319	263
320		- errors = [];
321		- const fieldContainer = field.closest( '.frm_form_field' );
322		-
323		- if ( ! fieldContainer ) {
324		- // Hidden fields do not have a field container and do not require JS validation.
325		- return;
326		- }
327		-
328		- if ( hasClass( fieldContainer, 'frm_required_field' ) && ! hasClass( field, 'frm_optional' ) ) {
	264	+ if ( $fieldCont.hasClass( 'frm_required_field' ) && ! jQuery( field ).hasClass( 'frm_optional' ) ) {
329	265	errors = checkRequiredField( field, errors );
330	266	}
331	267
332	268	if ( errors.length < 1 ) {
333		- validateFieldValue( field, errors, false );
	269	+ validateFieldValue( field, errors );
334	270	}
335	271
336		- const hasErrors = Object.keys( errors ).length > 0;
337		-
338		- if ( addErrors ) {
339		- removeFieldError( fieldContainer );
340		- if ( hasErrors ) {
341		- for ( key in errors ) {
342		- addFieldError( fieldContainer, key, errors );
343		- }
	272	+ removeFieldError( $fieldCont );
	273	+ if ( Object.keys( errors ).length > 0 ) {
	274	+ for ( key in errors ) {
	275	+ addFieldError( $fieldCont, key, errors );
344	276	}
345		- } else if ( ! hasErrors ) {
346		- // JS validation is off, so only remove existing errors once the field passes validation.
347		- removeFieldError( fieldContainer );
348	277	}
349	278	}
350	279
351		- /**
352		- * Validates a field value.
353		- *
354		- * @since 6.15 Added `onSubmit` parameter.
355		- *
356		- * @param {HTMLElement} field Field input.
357		- * @param {Object} errors Errors data.
358		- * @param {boolean} onSubmit Is `true` if the form is being submitted.
359		- */
360		- function validateFieldValue( field, errors, onSubmit ) {
	280	+ function validateFieldValue( field, errors ) {
361	281	if ( field.type === 'hidden' ) {
362	282	// don't validate
363	283	} else if ( field.type === 'number' ) {
364	284	checkNumberField( field, errors );
365	285	} else if ( field.type === 'email' ) {
366		- checkEmailField( field, errors, onSubmit );
	286	+ checkEmailField( field, errors );
367	287	} else if ( field.type === 'password' ) {
368		- checkPasswordField( field, errors, onSubmit );
	288	+ checkPasswordField( field, errors );
369	289	} else if ( field.type === 'url' ) {
370	290	checkUrlField( field, errors );
371	291	} else if ( field.pattern !== null ) {
372	292	checkPatternField( field, errors );
		@@ -371,34 +291,19 @@
371	291	} else if ( field.pattern !== null ) {
372	292	checkPatternField( field, errors );
373	293	}
374	294
375		- if ( 'tel' === field.type && shouldCheckConfirmField( field, onSubmit ) ) {
376		- confirmField( field, errors );
377		- }
378		-
379		- /**
380		- * @since 6.15 Added `onSubmit` to the data.
381		- */
382	295	triggerCustomEvent( document, 'frm_validate_field_value', {
383		- field,
384		- errors,
385		- onSubmit
386		- } );
	296	+ field: field,
	297	+ errors: errors
	298	+ });
387	299	}
388	300
389		- /**
390		- * @param {HTMLElement} field
391		- * @param {Array} errors
392		- * @return {Array} Errors
393		- */
394	301	function checkRequiredField( field, errors ) {
395		- let tempVal;
396		- let i;
397		- let placeholder;
398		- let val = '';
399		- let fieldID = '';
400		- let fileID = field.getAttribute( 'data-frmfile' );
	302	+ let checkGroup, tempVal, i, placeholder,
	303	+ val = '',
	304	+ fieldID = '',
	305	+ fileID = field.getAttribute( 'data-frmfile' );
401	306
402	307	if ( field.type === 'hidden' && fileID === null && ! isAppointmentField( field ) && ! isInlineDatepickerField( field ) ) {
403	308	return errors;
404	309	}
		@@ -403,26 +308,19 @@
403	308	return errors;
404	309	}
405	310
406	311	if ( field.type === 'checkbox' || field.type === 'radio' ) {
407		- document.querySelectorAll( `input[name="${ field.name }"]` ).forEach( function( input ) {
408		- const requiredField = input.closest( '.frm_required_field' );
409		- if ( ! requiredField ) {
410		- return;
411		- }
412		-
413		- const checkedInputs = requiredField.querySelectorAll( 'input:checked' );
414		- checkedInputs.forEach( function( checkedInput ) {
415		- val = checkedInput.value;
416		- } );
417		- } );
	312	+ checkGroup = jQuery( 'input[name="' + field.name + '"]' ).closest( '.frm_required_field' ).find( 'input:checked' );
	313	+ jQuery( checkGroup ).each( function() {
	314	+ val = this.value;
	315	+ });
418	316	} else if ( field.type === 'file' || fileID ) {
419		- if ( fileID === undefined ) {
	317	+ if ( typeof fileID === 'undefined' ) {
420	318	fileID = getFieldId( field, true );
421	319	fileID = fileID.replace( 'file', '' );
422	320	}
423	321
424		- if ( errors[ fileID ] === undefined ) {
	322	+ if ( typeof errors[ fileID ] === 'undefined' ) {
425	323	val = getFileVals( fileID );
426	324	}
427	325	fieldID = fileID;
428	326	} else {
		@@ -430,10 +328,9 @@
430	328	// skip hidden other fields
431	329	return errors;
432	330	}
433	331
434		- val = jQuery( field ).val(); // eslint-disable-line no-jquery/no-val
435		-
	332	+ val = jQuery( field ).val();
436	333	if ( val === null ) {
437	334	val = '';
438	335	} else if ( typeof val !== 'string' ) {
439	336	tempVal = val;
		@@ -438,10 +335,10 @@
438	335	} else if ( typeof val !== 'string' ) {
439	336	tempVal = val;
440	337	val = '';
441	338	for ( i = 0; i < tempVal.length; i++ ) {
442		- if ( tempVal[ i ] !== '' ) {
443		- val = tempVal[ i ];
	339	+ if ( tempVal[i] !== '' ) {
	340	+ val = tempVal[i];
444	341	}
445	342	}
446	343	}
447	344
		@@ -454,22 +351,14 @@
454	351	} else {
455	352	fieldID = getFieldId( field, true );
456	353	}
457	354
458		- // Make sure fieldID is a string.
459		- // fieldID may be a number which doesn't include a .replace function.
460		- if ( 'function' !== typeof fieldID.replace ) {
461		- fieldID = fieldID.toString();
462		- }
463		-
464	355	if ( hasClass( field, 'frm_time_select' ) ) {
465	356	// set id for time field
466	357	fieldID = fieldID.replace( '-H', '' ).replace( '-m', '' );
467	358	} else if ( isSignatureField( field ) ) {
468	359	if ( val === '' ) {
469		- const fieldContainer = field.closest( '.frm_form_field' );
470		- const outputField = fieldContainer ? fieldContainer.querySelector( `[name="${ field.getAttribute( 'name' ).replace( '[typed]', '[output]' ) }"]` ) : null;
471		- val = outputField ? outputField.value : '';
	360	+ val = jQuery( field ).closest( '.frm_form_field' ).find( '[name="' + field.getAttribute( 'name' ).replace( '[typed]', '[output]' ) + '"]' ).val();
472	361	}
473	362	fieldID = fieldID.replace( '-typed', '' );
474	363	}
475	364
		@@ -490,57 +379,36 @@
490	379
491	380	return errors;
492	381	}
493	382
494		- /**
495		- * @param {HTMLElement} field
496		- * @return {boolean} True if the input is a typed signature input.
497		- */
498	383	function isSignatureField( field ) {
499	384	const name = field.getAttribute( 'name' );
500	385	return 'string' === typeof name && '[typed]' === name.substr( -7 );
501	386	}
502	387
503		- /**
504		- * @param {HTMLElement} field
505		- * @return {boolean} True if the field is a SSA appointment field.
506		- */
507	388	function isAppointmentField( field ) {
508	389	return hasClass( field, 'ssa_appointment_form_field_appointment_id' );
509	390	}
510	391
511		- /**
512		- * @param {HTMLElement} field
513		- * @return {boolean} True if the field is inline datepicker field.
514		- */
515	392	function isInlineDatepickerField( field ) {
516	393	return 'hidden' === field.type && '_alt' === field.id.substr( -4 ) && hasClass( field.nextElementSibling, 'frm_date_inline' );
517	394	}
518	395
519		- /**
520		- * @param {string|number} fileID
521		- * @return {string} File input value.
522		- */
523	396	function getFileVals( fileID ) {
524		- let val = '';
525		- const fileFields = document.querySelectorAll( `input[name="file${ fileID }"], input[name="file${ fileID }[]"], input[name^="item_meta[${ fileID }]"]` );
	397	+ let val = '',
	398	+ fileFields = jQuery( 'input[name="file' + fileID + '"], input[name="file' + fileID + '[]"], input[name^="item_meta[' + fileID + ']"]' );
526	399
527		- fileFields.forEach( function( field ) {
	400	+ fileFields.each( function() {
528	401	if ( val === '' ) {
529		- val = field.value;
	402	+ val = this.value;
530	403	}
531		- } );
	404	+ });
532	405	return val;
533	406	}
534	407
535		- /**
536		- * @param {HTMLElement} field
537		- * @param {Array} errors
538		- * @return {void}
539		- */
540	408	function checkUrlField( field, errors ) {
541		- let fieldID;
542		- const url = field.value;
	409	+ let fieldID,
	410	+ url = field.value;
543	411
544	412	if ( url !== '' && ! /^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i.test( url ) ) {
545	413	fieldID = getFieldId( field, true );
546	414	if ( ! ( fieldID in errors ) ) {
		@@ -548,90 +416,41 @@
548	416	}
549	417	}
550	418	}
551	419
552		- /**
553		- * Checks if the confirm field should be checked.
554		- *
555		- * @since 6.15
556		- *
557		- * @param {HTMLElement} field Field input.
558		- * @param {boolean} onSubmit Is `true` if the form is being submitted.
559		- * @return {boolean} True if we should confirm the field.
560		- */
561		- function shouldCheckConfirmField( field, onSubmit ) {
562		- if ( onSubmit ) {
563		- // Always check on submitting.
564		- return true;
565		- }
	420	+ function checkEmailField( field, errors ) {
	421	+ const fieldID = getFieldId( field, true ),
	422	+ pattern = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i;
566	423
567		- if ( 0 === field.id.indexOf( 'field_conf_' ) ) {
568		- // Always check if it's the confirm field.
569		- return true;
570		- }
571		-
572		- return false;
573		- }
574		-
575		- /**
576		- * Check the email field for errors.
577		- *
578		- * @since 6.15 Added `onSubmit` parameter.
579		- *
580		- * @param {HTMLElement} field Field input.
581		- * @param {Object} errors Errors data.
582		- * @param {boolean} onSubmit Is `true` if the form is being submitted.
583		- */
584		- function checkEmailField( field, errors, onSubmit ) {
585		- const fieldID = getFieldId( field, true );
586		- const pattern = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i;
587		-
588	424	// validate the current field we're editing first
589	425	if ( '' !== field.value && pattern.test( field.value ) === false ) {
590	426	errors[ fieldID ] = getFieldValidationMessage( field, 'data-invmsg' );
591	427	}
592	428
593		- if ( shouldCheckConfirmField( field, onSubmit ) ) {
594		- confirmField( field, errors );
595		- }
	429	+ confirmField( field, errors );
596	430	}
597	431
598		- /**
599		- * Check the password field for errors.
600		- *
601		- * @since 6.15 Added `onSubmit` parameter.
602		- *
603		- * @param {HTMLElement} field Field input.
604		- * @param {Object} errors Errors data.
605		- * @param {boolean} onSubmit Is `true` if the form is being submitted.
606		- */
607		- function checkPasswordField( field, errors, onSubmit ) {
608		- if ( shouldCheckConfirmField( field, onSubmit ) ) {
609		- confirmField( field, errors );
610		- }
	432	+ function checkPasswordField( field, errors ) {
	433	+ confirmField( field, errors );
611	434	}
612	435
613		- /**
614		- * @param {HTMLElement} field
615		- * @param {Array} errors
616		- * @return {void}
617		- */
618	436	function confirmField( field, errors ) {
619		- const fieldID = getFieldId( field, true );
620		- const strippedId = field.id.replace( 'conf_', '' );
621		- const strippedFieldID = fieldID.replace( 'conf_', '' );
622		- const confirmField = document.getElementById( strippedId.replace( 'field_', 'field_conf_' ) );
	437	+ let value, confirmValue, firstField,
	438	+ fieldID = getFieldId( field, true ),
	439	+ strippedId = field.id.replace( 'conf_', '' ),
	440	+ strippedFieldID = fieldID.replace( 'conf_', '' ),
	441	+ confirmField = document.getElementById( strippedId.replace( 'field_', 'field_conf_' ) );
623	442
624		- if ( ! confirmField || errors[ `conf_${ strippedFieldID }` ] !== undefined ) {
	443	+ if ( confirmField === null || typeof errors[ 'conf_' + strippedFieldID ] !== 'undefined' ) {
625	444	return;
626	445	}
627	446
628	447	if ( fieldID !== strippedFieldID ) {
629		- const firstField = document.getElementById( strippedId );
630		- const { value } = firstField;
631		- const confirmValue = confirmField.value;
	448	+ firstField = document.getElementById( strippedId );
	449	+ value = firstField.value;
	450	+ confirmValue = confirmField.value;
632	451	if ( value !== confirmValue ) {
633		- errors[ `conf_${ strippedFieldID }` ] = getFieldValidationMessage( confirmField, 'data-confmsg' );
	452	+ errors[ 'conf_' + strippedFieldID ] = getFieldValidationMessage( confirmField, 'data-confmsg' );
634	453	}
635	454	} else {
636	455	validateField( confirmField );
637	456	}
		@@ -636,16 +455,11 @@
636	455	validateField( confirmField );
637	456	}
638	457	}
639	458
640		- /**
641		- * @param {HTMLElement} field
642		- * @param {Array} errors
643		- * @return {void}
644		- */
645	459	function checkNumberField( field, errors ) {
646		- let fieldID;
647		- const number = field.value;
	460	+ let fieldID,
	461	+ number = field.value;
648	462
649	463	if ( number !== '' && isNaN( number / 1 ) !== false ) {
650	464	fieldID = getFieldId( field, true );
651	465	if ( ! ( fieldID in errors ) ) {
		@@ -653,17 +467,12 @@
653	467	}
654	468	}
655	469	}
656	470
657		- /**
658		- * @param {HTMLElement} field
659		- * @param {Array} errors
660		- * @return {void}
661		- */
662	471	function checkPatternField( field, errors ) {
663		- let fieldID;
664		- const text = field.value;
665		- let format = getFieldValidationMessage( field, 'pattern' );
	472	+ let fieldID,
	473	+ text = field.value,
	474	+ format = getFieldValidationMessage( field, 'pattern' );
666	475
667	476	if ( format !== '' && text !== '' ) {
668	477	fieldID = getFieldId( field, true );
669	478	if ( ! ( fieldID in errors ) ) {
		@@ -671,9 +480,9 @@
671	480	if ( ! window.frmProForm.validateIntlPhoneInput( field ) ) {
672	481	errors[ fieldID ] = getFieldValidationMessage( field, 'data-invmsg' );
673	482	}
674	483	} else {
675		- format = new RegExp( `^${ format }$`, 'i' );
	484	+ format = new RegExp( '^' + format + '$', 'i' );
676	485	if ( format.test( text ) === false ) {
677	486	errors[ fieldID ] = getFieldValidationMessage( field, 'data-invmsg' );
678	487	}
679	488	}
		@@ -686,11 +495,13 @@
686	495	*
687	496	* @since 6.5.1
688	497	*/
689	498	function setSelectPlaceholderColor() {
690		- const selects = document.querySelectorAll( '.form-field select' );
691		- const styleElement = document.querySelector( '.with_frm_style' );
692		- const textColorDisabled = styleElement ? getComputedStyle( styleElement ).getPropertyValue( '--text-color-disabled' ).trim() : '';
	499	+ let selects = document.querySelectorAll( '.form-field select' ),
	500	+ styleElement = document.querySelector( '.with_frm_style' ),
	501	+ textColorDisabled = styleElement ? getComputedStyle( styleElement ).getPropertyValue( '--text-color-disabled' ).trim() : '',
	502	+ changeSelectColor;
	503	+
693	504	// Exit if there are no select elements or the textColorDisabled property is missing
694	505	if ( ! selects.length || ! textColorDisabled ) {
695	506	return;
696	507	}
		@@ -695,10 +506,10 @@
695	506	return;
696	507	}
697	508
698	509	// Function to change the color of a select element
699		- const changeSelectColor = function( select ) {
700		- if ( select.options[ select.selectedIndex ] && hasClass( select.options[ select.selectedIndex ], 'frm-select-placeholder' ) ) {
	510	+ changeSelectColor = function( select ) {
	511	+ if ( select.options[select.selectedIndex] && hasClass( select.options[select.selectedIndex], 'frm-select-placeholder' ) ) {
701	512	select.style.setProperty( 'color', textColorDisabled, 'important' );
702	513	} else {
703	514	select.style.color = '';
704	515	}
		@@ -711,81 +522,57 @@
711	522
712	523	// Add an event listener for future changes
713	524	select.addEventListener( 'change', function() {
714	525	changeSelectColor( select );
715		- } );
716		- } );
	526	+ });
	527	+ });
717	528	}
718	529
719		- /**
720		- * @param {HTMLElement|jQuery} object
721		- *
722		- * @return {HTMLElement|false} Captcha element if there is an invisible recaptcha.
723		- */
724	530	function hasInvisibleRecaptcha( object ) {
	531	+ let recaptcha, recaptchaID, alreadyChecked;
	532	+
725	533	if ( isGoingToPrevPage( object ) ) {
726	534	return false;
727	535	}
728	536
729		- const form = object instanceof jQuery ? object.get( 0 ) : object;
730		- if ( ! form ) {
731		- return false;
732		- }
733		-
734		- const recaptcha = form.querySelector( '.frm-g-recaptcha[data-size="invisible"], .g-recaptcha[data-size="invisible"]' );
735		- if ( recaptcha ) {
736		- const recaptchaID = recaptcha.dataset.rid;
737		- const alreadyChecked = grecaptcha.getResponse( recaptchaID );
	537	+ recaptcha = jQuery( object ).find( '.frm-g-recaptcha[data-size="invisible"], .g-recaptcha[data-size="invisible"]' );
	538	+ if ( recaptcha.length ) {
	539	+ recaptchaID = recaptcha.data( 'rid' );
	540	+ alreadyChecked = grecaptcha.getResponse( recaptchaID );
738	541	if ( alreadyChecked.length === 0 ) {
739	542	return recaptcha;
740	543	}
741	544	}
742		-
743	545	return false;
744	546	}
745	547
746		- /**
747		- * @param {HTMLElement} invisibleRecaptcha
748		- *
749		- * @return {void}
750		- */
751	548	function executeInvisibleRecaptcha( invisibleRecaptcha ) {
752		- const recaptchaID = invisibleRecaptcha.dataset.rid;
	549	+ const recaptchaID = invisibleRecaptcha.data( 'rid' );
753	550	grecaptcha.reset( recaptchaID );
754	551	grecaptcha.execute( recaptchaID );
755	552	}
756	553
757	554	function validateRecaptcha( form, errors ) {
758		- const formEl = form instanceof jQuery ? form.get( 0 ) : form;
759		- if ( ! formEl ) {
760		- return errors;
761		- }
	555	+ let recaptchaID, response, fieldContainer, fieldID,
	556	+ $recaptcha = jQuery( form ).find( '.frm-g-recaptcha' );
	557	+ if ( $recaptcha.length ) {
	558	+ recaptchaID = $recaptcha.data( 'rid' );
762	559
763		- const recaptcha = formEl.querySelector( '.frm-g-recaptcha' );
764		- if ( ! recaptcha ) {
765		- return errors;
766		- }
767		-
768		- const recaptchaID = recaptcha.dataset.rid;
769		- let response;
770		-
771		- try {
772		- response = grecaptcha.getResponse( recaptchaID );
773		- } catch ( e ) {
774		- if ( formEl.querySelector( 'input[name="recaptcha_checked"]' ) ) {
775		- return errors;
	560	+ try {
	561	+ response = grecaptcha.getResponse( recaptchaID );
	562	+ } catch ( e ) {
	563	+ if ( jQuery( form ).find( 'input[name="recaptcha_checked"]' ).length ) {
	564	+ return errors;
	565	+ }
	566	+ response = '';
776	567	}
777		- response = '';
778		- }
779	568
780		- if ( response.length === 0 ) {
781		- const fieldContainer = recaptcha.closest( '.frm_form_field' );
782		- if ( fieldContainer?.id ) {
783		- const fieldID = fieldContainer.id.replace( 'frm_field_', '' ).replace( '_container', '' );
	569	+ if ( response.length === 0 ) {
	570	+ fieldContainer = $recaptcha.closest( '.frm_form_field' );
	571	+ fieldID = fieldContainer.attr( 'id' ).replace( 'frm_field_', '' ).replace( '_container', '' );
784	572	errors[ fieldID ] = '';
785	573	}
786	574	}
787		-
788	575	return errors;
789	576	}
790	577
791	578	/**
		@@ -816,15 +603,15 @@
816	603	if ( null === errorHtml ) {
817	604	return msg;
818	605	}
819	606
820		- errorHtml = errorHtml.replace( /\+/g, '%20' );
821		- msg = decodeURIComponent( errorHtml ).replace( '[error]', msg );
822		- const fieldId = getFieldId( field, false );
823		- const split = fieldId.split( '-' );
	607	+ errorHtml = errorHtml.replace( /\+/g, '%20' );
	608	+ msg = decodeURIComponent( errorHtml ).replace( '[error]', msg );
	609	+ const fieldId = getFieldId( field, false );
	610	+ const split = fieldId.split( '-' );
824	611	const fieldIdParts = field.id.split( '_' );
825	612	fieldIdParts.shift(); // Drop the "field" value from the front.
826		- split[ 0 ] = fieldIdParts.join( '_' );
	613	+ split[0] = fieldIdParts.join( '_' );
827	614	const errorKey = split.join( '-' );
828	615	return msg.replace( '[key]', errorKey );
829	616	}
830	617
		@@ -850,38 +637,26 @@
850	637
851	638	return validate;
852	639	}
853	640
854		- /**
855		- * @param {HTMLElement} object
856		- * @param {string} action
857		- * @return {void}
858		- */
859	641	function getFormErrors( object, action ) {
860		- const fieldsets = object.querySelectorAll( '.frm_form_field' );
861		- fieldsets.forEach( field => field.classList.add( 'frm_doing_ajax' ) );
	642	+ let fieldset, data, success, error, shouldTriggerEvent;
862	643
863		- const data = `${ jQuery( object ).serialize() }&action=frm_entries_${ action }&nonce=${ frm_js.nonce }`; // eslint-disable-line no-jquery/no-serialize
864		- const shouldTriggerEvent = object.classList.contains( 'frm_trigger_event_on_submit' );
	644	+ if ( typeof action === 'undefined' ) {
	645	+ jQuery( object ).find( 'input[name="frm_action"]' ).val();
	646	+ }
865	647
866		- const doRedirect = response => {
867		- jQuery( document ).trigger( 'frmBeforeFormRedirect', [ object, response ] );
	648	+ fieldset = jQuery( object ).find( '.frm_form_field' );
	649	+ fieldset.addClass( 'frm_doing_ajax' );
868	650
869		- if ( ! response.openInNewTab ) {
870		- // We return here because we're redirecting there is no need to update content.
871		- window.location = response.redirect;
872		- return;
873		- }
	651	+ data = jQuery( object ).serialize() + '&action=frm_entries_' + action + '&nonce=' + frm_js.nonce; // eslint-disable-line camelcase
	652	+ shouldTriggerEvent = object.classList.contains( 'frm_trigger_event_on_submit' );
874	653
875		- // We don't return here because we're opening in a new tab, the old tab will still update.
876		- const newTab = window.open( response.redirect, '_blank' );
877		- if ( ! newTab && response.fallbackMsg && response.content ) {
878		- response.content = response.content.trim().replace( /(<\/div><\/div>)$/, ` ${ response.fallbackMsg }</div></div>` );
879		- }
880		- };
	654	+ success = function( response ) {
	655	+ let defaultResponse, formID, replaceContent, pageOrder, formReturned, contSubmit, delay,
	656	+ $fieldCont, key, inCollapsedSection, frmTrigger, newTab;
881	657
882		- const success = function( response ) {
883		- const defaultResponse = {
	658	+ defaultResponse = {
884	659	content: '',
885	660	errors: {},
886	661	pass: false
887	662	};
		@@ -887,59 +662,61 @@
887	662	};
888	663
889	664	if ( response === null ) {
890	665	response = defaultResponse;
	666	+ }
	667	+
	668	+ response = response.replace( /^\s+|\s+$/g, '' );
	669	+ if ( response.indexOf( '{' ) === 0 ) {
	670	+ response = JSON.parse( response );
891	671	} else {
892		- // Response is a string. Convert it to an object.
893		- response = response.replace( /^\s+|\s+$/g, '' );
894		- if ( response.indexOf( '{' ) === 0 ) {
895		- response = JSON.parse( response );
896		- } else {
897		- response = defaultResponse;
898		- }
	672	+ response = defaultResponse;
899	673	}
900	674
901		- let willRedirect = false;
902		-
903		- if ( response.redirect !== undefined ) {
	675	+ if ( typeof response.redirect !== 'undefined' ) {
904	676	if ( shouldTriggerEvent ) {
905	677	triggerCustomEvent( object, 'frmSubmitEvent' );
906	678	return;
907	679	}
908	680
909		- if ( response.delay ) {
910		- setTimeout( function() {
911		- doRedirect( response );
912		- }, 1000 * response.delay );
913		- } else {
914		- doRedirect( response );
	681	+ jQuery( document ).trigger( 'frmBeforeFormRedirect', [ object, response ]);
	682	+
	683	+ if ( ! response.openInNewTab ) {
	684	+ // We return here because we're redirecting there is no need to update content.
	685	+ window.location = response.redirect;
	686	+ return;
915	687	}
916	688
917		- willRedirect = true;
	689	+ // We don't return here because we're opening in a new tab, the old tab will still update.
	690	+ newTab = window.open( response.redirect, '_blank' );
	691	+ if ( ! newTab && response.fallbackMsg && response.content ) {
	692	+ response.content = response.content.trim().replace( /(<\/div><\/div>)$/, ' ' + response.fallbackMsg + '</div></div>' );
	693	+ }
918	694	}
919	695
920		- if ( 'string' === typeof response.content && response.content !== '' ) {
	696	+ if ( response.content !== '' ) {
921	697	// the form or success message was returned
922	698
923	699	if ( shouldTriggerEvent ) {
924		- triggerCustomEvent( object, 'frmSubmitEvent', { content: response.content } );
	700	+ triggerCustomEvent( object, 'frmSubmitEvent', { content: response.content });
925	701	return;
926	702	}
927	703
928	704	removeSubmitLoading( jQuery( object ) );
929		- if ( frm_js.offset != -1 ) {
	705	+ if ( frm_js.offset != -1 ) { // eslint-disable-line camelcase
930	706	frmFrontForm.scrollMsg( jQuery( object ), false );
931	707	}
932	708
933		- const formIdInput = object.querySelector( 'input[name="form_id"]' );
934		- const formID = formIdInput ? formIdInput.value : '';
	709	+ formID = jQuery( object ).find( 'input[name="form_id"]' ).val();
935	710	response.content = response.content.replace( / frm_pro_form /g, ' frm_pro_form frm_no_hide ' );
936		- const replaceContent = jQuery( object ).closest( '.frm_forms' ); // eslint-disable-line no-jquery/no-closest
	711	+ replaceContent = jQuery( object ).closest( '.frm_forms' );
937	712	removeAddedScripts( replaceContent, formID );
938		- const delay = maybeSlideOut( replaceContent, response.content );
	713	+ delay = maybeSlideOut( replaceContent, response.content );
939	714
940	715	setTimeout(
941	716	function() {
	717	+ let container, input, previousInput;
	718	+
942	719	afterFormSubmittedBeforeReplace( object, response );
943	720
944	721	replaceContent.replaceWith( response.content );
945	722
		@@ -945,41 +722,48 @@
945	722
946	723	addUrlParam( response );
947	724
948	725	if ( typeof frmThemeOverride_frmAfterSubmit === 'function' ) { // eslint-disable-line camelcase
949		- const pageOrderInput = document.querySelector( `input[name="frm_page_order_${ formID }"]` );
950		- const pageOrder = pageOrderInput ? pageOrderInput.value : '';
951		- const tempDiv = document.createElement( 'div' );
952		- tempDiv.innerHTML = response.content;
953		- const formReturnedInput = tempDiv.querySelector( 'input[name="form_id"]' );
954		- const formReturned = formReturnedInput ? formReturnedInput.value : '';
	726	+ pageOrder = jQuery( 'input[name="frm_page_order_' + formID + '"]' ).val();
	727	+ formReturned = jQuery( response.content ).find( 'input[name="form_id"]' ).val();
955	728	frmThemeOverride_frmAfterSubmit( formReturned, pageOrder, response.content, object );
956	729	}
957	730
	731	+ if ( typeof response.recaptcha !== 'undefined' ) {
	732	+ container = jQuery( '#frm_form_' + formID + '_container' ).find( '.frm_fields_container' );
	733	+ input = '<input type="hidden" name="recaptcha_checked" value="' + response.recaptcha + '">';
	734	+ previousInput = container.find( 'input[name="recaptcha_checked"]' );
	735	+
	736	+ if ( previousInput.length ) {
	737	+ previousInput.replaceWith( input );
	738	+ } else {
	739	+ container.append( input );
	740	+ }
	741	+ }
	742	+
958	743	afterFormSubmitted( object, response );
959	744	},
960	745	delay
961	746	);
962		- } else if ( response.errors !== undefined && Object.keys( response.errors ).length ) {
	747	+ } else if ( Object.keys( response.errors ).length ) {
963	748	// errors were returned
964	749	removeSubmitLoading( jQuery( object ), 'enable' );
965	750
966	751	//show errors
967		- let contSubmit = true;
	752	+ contSubmit = true;
968	753	removeAllErrors();
969	754
970		- let $fieldCont = null;
	755	+ $fieldCont = null;
971	756
972		- for ( const key in response.errors ) {
973		- const fieldContEl = object.querySelector( `#frm_field_${ key }_container` );
974		- $fieldCont = fieldContEl ? jQuery( fieldContEl ) : jQuery();
	757	+ for ( key in response.errors ) {
	758	+ $fieldCont = jQuery( object ).find( '#frm_field_' + key + '_container' );
975	759
976	760	if ( $fieldCont.length ) {
977		- if ( ! $fieldCont.is( ':visible' ) ) { // eslint-disable-line no-jquery/no-is
978		- const inCollapsedSection = $fieldCont.closest( '.frm_toggle_container' ); // eslint-disable-line no-jquery/no-closest, formidable/no-jquery-variable-methods
	761	+ if ( ! $fieldCont.is( ':visible' ) ) {
	762	+ inCollapsedSection = $fieldCont.closest( '.frm_toggle_container' );
979	763	if ( inCollapsedSection.length ) {
980		- let frmTrigger = inCollapsedSection.prev();
981		- if ( ! frmTrigger.hasClass( 'frm_trigger' ) ) { // eslint-disable-line formidable/no-jquery-variable-methods
	764	+ frmTrigger = inCollapsedSection.prev();
	765	+ if ( ! frmTrigger.hasClass( 'frm_trigger' ) ) {
982	766	// If the frmTrigger object is the section description, check to see if the previous element is the trigger
983	767	frmTrigger = frmTrigger.prev( '.frm_trigger' );
984	768	}
985	769	frmTrigger.trigger( 'click' );
		@@ -985,9 +769,9 @@
985	769	frmTrigger.trigger( 'click' );
986	770	}
987	771	}
988	772
989		- if ( $fieldCont.is( ':visible' ) ) { // eslint-disable-line no-jquery/no-is
	773	+ if ( $fieldCont.is( ':visible' ) ) {
990	774	addFieldError( $fieldCont, key, response.errors );
991	775	contSubmit = false;
992	776	}
993	777	}
		@@ -992,10 +776,11 @@
992	776	}
993	777	}
994	778	}
995	779
996		- object.querySelectorAll( '.frm-g-recaptcha, .g-recaptcha, .h-captcha' ).forEach( function( captchaEl ) {
997		- const recaptchaID = captchaEl.dataset.rid;
	780	+ jQuery( object ).find( '.frm-g-recaptcha, .g-recaptcha, .h-captcha' ).each( function() {
	781	+ const $recaptcha = jQuery( this ),
	782	+ recaptchaID = $recaptcha.data( 'rid' );
998	783
999	784	if ( typeof grecaptcha !== 'undefined' && grecaptcha ) {
1000	785	if ( recaptchaID ) {
1001	786	grecaptcha.reset( recaptchaID );
		@@ -1002,23 +787,16 @@
1002	787	} else {
1003	788	grecaptcha.reset();
1004	789	}
1005	790	}
1006		-
1007	791	if ( typeof hcaptcha !== 'undefined' && hcaptcha ) {
1008	792	hcaptcha.reset();
1009	793	}
1010		- } );
	794	+ });
1011	795
1012		- if ( window.turnstile ) {
1013		- object.querySelectorAll( '.frm-cf-turnstile' ).forEach(
1014		- turnstileField => turnstileField.dataset.rid && turnstile.reset( turnstileField.dataset.rid )
1015		- );
1016		- }
	796	+ jQuery( document ).trigger( 'frmFormErrors', [ object, response ]);
1017	797
1018		- jQuery( document ).trigger( 'frmFormErrors', [ object, response ] );
1019		-
1020		- fieldsets.forEach( field => field.classList.remove( 'frm_doing_ajax' ) );
	798	+ fieldset.removeClass( 'frm_doing_ajax' );
1021	799	scrollToFirstField( object );
1022	800
1023	801	if ( contSubmit ) {
1024	802	object.submit();
		@@ -1025,10 +803,10 @@
1025	803	} else {
1026	804	object.insertAdjacentHTML( 'afterbegin', response.error_message );
1027	805	checkForErrorsAndMaybeSetFocus();
1028	806	}
1029		- } else if ( ! willRedirect ) { // Avoid double submission if redirecting to a page.
1030		- // There may have been a plugin conflict, or the form is not set to submit with ajax.
	807	+ } else {
	808	+ // there may have been a plugin conflict, or the form is not set to submit with ajax
1031	809
1032	810	showFileLoading( object );
1033	811
1034	812	object.submit();
		@@ -1034,12 +812,10 @@
1034	812	object.submit();
1035	813	}
1036	814	};
1037	815
1038		- const error = function() {
1039		- object.querySelectorAll( 'input[type="submit"], input[type="button"]' ).forEach(
1040		- button => button.disabled = false
1041		- );
	816	+ error = function() {
	817	+ jQuery( object ).find( 'input[type="submit"], input[type="button"]' ).prop( 'disabled', false );
1042	818	object.submit();
1043	819	};
1044	820
1045	821	postToAjaxUrl( object, data, success, error );
		@@ -1045,20 +821,22 @@
1045	821	postToAjaxUrl( object, data, success, error );
1046	822	}
1047	823
1048	824	function postToAjaxUrl( form, data, success, error ) {
1049		- let ajaxUrl = frm_js.ajax_url;
1050		- const action = form.getAttribute( 'action' );
	825	+ let ajaxUrl, action, ajaxParams;
1051	826
1052		- if ( 'string' === typeof action && action.includes( '?action=frm_forms_preview' ) ) {
1053		- ajaxUrl = action.split( '?action=frm_forms_preview' )[ 0 ];
	827	+ ajaxUrl = frm_js.ajax_url; // eslint-disable-line camelcase
	828	+ action = form.getAttribute( 'action' );
	829	+
	830	+ if ( 'string' === typeof action && -1 !== action.indexOf( '?action=frm_forms_preview' ) ) {
	831	+ ajaxUrl = action.split( '?action=frm_forms_preview' )[0];
1054	832	}
1055	833
1056		- const ajaxParams = {
	834	+ ajaxParams = {
1057	835	type: 'POST',
1058	836	url: ajaxUrl,
1059		- data,
1060		- success
	837	+ data: data,
	838	+ success: success
1061	839	};
1062	840
1063	841	if ( 'function' === typeof error ) {
1064	842	ajaxParams.error = error;
		@@ -1063,19 +841,17 @@
1063	841	if ( 'function' === typeof error ) {
1064	842	ajaxParams.error = error;
1065	843	}
1066	844
1067		- jQuery.ajax( ajaxParams ); // eslint-disable-line no-jquery/no-ajax
	845	+ jQuery.ajax( ajaxParams );
1068	846	}
1069	847
1070	848	function afterFormSubmitted( object, response ) {
1071		- const tempDiv = document.createElement( 'div' );
1072		- tempDiv.innerHTML = response.content;
1073		- const formCompleted = tempDiv.querySelector( '.frm_message' );
1074		- if ( formCompleted ) {
1075		- jQuery( document ).trigger( 'frmFormComplete', [ object, response ] );
	849	+ const formCompleted = jQuery( response.content ).find( '.frm_message' );
	850	+ if ( formCompleted.length ) {
	851	+ jQuery( document ).trigger( 'frmFormComplete', [ object, response ]);
1076	852	} else {
1077		- jQuery( document ).trigger( 'frmPageChanged', [ object, response ] );
	853	+ jQuery( document ).trigger( 'frmPageChanged', [ object, response ]);
1078	854	}
1079	855	}
1080	856
1081	857	/**
		@@ -1087,30 +863,28 @@
1087	863	* @param {Object} response The response from submitting the form with AJAX.
1088	864	* @return {void}
1089	865	*/
1090	866	function afterFormSubmittedBeforeReplace( object, response ) {
1091		- const tempDiv = document.createElement( 'div' );
1092		- tempDiv.innerHTML = response.content;
1093		- const formCompleted = tempDiv.querySelector( '.frm_message' );
1094		- if ( formCompleted ) {
1095		- triggerCustomEvent( document, 'frmFormCompleteBeforeReplace', { object, response } );
	867	+ const formCompleted = jQuery( response.content ).find( '.frm_message' );
	868	+ if ( formCompleted.length ) {
	869	+ triggerCustomEvent( document, 'frmFormCompleteBeforeReplace', { object, response });
1096	870	}
1097	871	}
1098	872
1099	873	function removeAddedScripts( formContainer, formID ) {
1100		- const endReplace = document.querySelectorAll( `.frm_end_ajax_${ formID }` );
	874	+ const endReplace = jQuery( '.frm_end_ajax_' + formID );
1101	875	if ( endReplace.length ) {
1102		- formContainer.nextUntil( `.frm_end_ajax_${ formID }` ).remove();
1103		- endReplace.forEach( el => el.remove() );
	876	+ formContainer.nextUntil( '.frm_end_ajax_' + formID ).remove();
	877	+ endReplace.remove();
1104	878	}
1105	879	}
1106	880
1107	881	function maybeSlideOut( oldContent, newContent ) {
1108		- let c;
1109		- let newClass = 'frm_slideout';
1110		- if ( newContent.includes( ' frm_slide' ) ) {
	882	+ let c,
	883	+ newClass = 'frm_slideout';
	884	+ if ( newContent.indexOf( ' frm_slide' ) !== -1 ) {
1111	885	c = oldContent.children();
1112		- if ( newContent.includes( ' frm_going_back' ) ) {
	886	+ if ( newContent.indexOf( ' frm_going_back' ) !== -1 ) {
1113	887	newClass += ' frm_going_back';
1114	888	}
1115	889	c.removeClass( 'frm_going_back' );
1116	890	c.addClass( newClass );
		@@ -1120,27 +894,29 @@
1120	894	}
1121	895
1122	896	function addUrlParam( response ) {
1123	897	let url;
1124		- if ( history.pushState && response.page !== undefined ) {
	898	+ if ( history.pushState && typeof response.page !== 'undefined' ) {
1125	899	url = addQueryVar( 'frm_page', response.page );
1126		- window.history.pushState( { html: response.html }, '', `?${ url }` );
	900	+ window.history.pushState({ 'html': response.html }, '', '?' + url );
1127	901	}
1128	902	}
1129	903
1130	904	function addQueryVar( key, value ) {
	905	+ let kvp, i, x;
	906	+
1131	907	key = encodeURI( key );
1132	908	value = encodeURI( value );
1133	909
1134		- const kvp = document.location.search.substr( 1 ).split( '&' );
	910	+ kvp = document.location.search.substr( 1 ).split( '&' );
1135	911
1136		- let i = kvp.length;
	912	+ i = kvp.length;
1137	913	while ( i-- ) {
1138		- const x = kvp[ i ].split( '=' );
	914	+ x = kvp[i].split( '=' );
1139	915
1140		- if ( x[ 0 ] == key ) {
1141		- x[ 1 ] = value;
1142		- kvp[ i ] = x.join( '=' );
	916	+ if ( x[0] == key ) {
	917	+ x[1] = value;
	918	+ kvp[i] = x.join( '=' );
1143	919	break;
1144	920	}
1145	921	}
1146	922
		@@ -1151,59 +927,44 @@
1151	927	return kvp.join( '&' );
1152	928	}
1153	929
1154	930	function addFieldError( $fieldCont, key, jsErrors ) {
1155		- const container = $fieldCont instanceof jQuery ? $fieldCont.get( 0 ) : $fieldCont;
	931	+ let input, id, describedBy, roleString;
	932	+ if ( $fieldCont.length && $fieldCont.is( ':visible' ) ) {
	933	+ $fieldCont.addClass( 'frm_blank_field' );
	934	+ input = $fieldCont.find( 'input, select, textarea' );
	935	+ id = getErrorElementId( key, input.get( 0 ) );
1156	936
1157		- if ( ! container || container.offsetParent === null ) {
1158		- return;
1159		- }
	937	+ describedBy = input.attr( 'aria-describedby' );
1160	938
1161		- container.classList.add( 'frm_blank_field' );
1162		- const inputs = container.querySelectorAll( 'input, select, textarea' );
1163		- const id = getErrorElementId( key, inputs[ 0 ] );
	939	+ if ( typeof frmThemeOverride_frmPlaceError === 'function' ) { // eslint-disable-line camelcase
	940	+ frmThemeOverride_frmPlaceError( key, jsErrors );
	941	+ } else {
	942	+ if ( -1 !== jsErrors[key].indexOf( '<div' ) ) {
	943	+ $fieldCont.append(
	944	+ jsErrors[key]
	945	+ );
	946	+ } else {
	947	+ roleString = frm_js.include_alert_role ? 'role="alert"' : ''; // eslint-disable-line camelcase
	948	+ $fieldCont.append( '<div class="frm_error" ' + roleString + ' id="' + id + '">' + jsErrors[key] + '</div>' );
	949	+ }
1164	950
1165		- let describedBy;
1166		-
1167		- if ( typeof frmThemeOverride_frmPlaceError === 'function' ) { // eslint-disable-line camelcase
1168		- frmThemeOverride_frmPlaceError( key, jsErrors );
1169		- } else {
1170		- let errorHtml;
1171		- if ( jsErrors[ key ].includes( '<div' ) ) {
1172		- errorHtml = jsErrors[ key ];
1173		- } else {
1174		- const roleString = frm_js.include_alert_role ? 'role="alert"' : '';
1175		- errorHtml = `<div class="frm_error" ${ roleString } id="${ id }">${ jsErrors[ key ] }</div>`;
1176		- }
1177		- container.insertAdjacentHTML( 'beforeend', errorHtml );
1178		- inputs.forEach( input => {
1179		- describedBy = input ? input.getAttribute( 'aria-describedby' ) : null;
1180		- if ( ! describedBy ) {
	951	+ if ( typeof describedBy === 'undefined' ) {
1181	952	describedBy = id;
1182		- } else if ( ! describedBy.includes( id ) && ! describedBy.includes( 'frm_error_field_' ) ) {
1183		- const { errorFirst } = input.dataset;
1184		- if ( errorFirst === '0' ) {
1185		- describedBy = `${ describedBy } ${ id }`;
	953	+ } else if ( describedBy.indexOf( id ) === -1 && describedBy.indexOf( 'frm_error_field_' ) === -1 ) {
	954	+ if ( input.data( 'error-first' ) === 0 ) {
	955	+ describedBy = describedBy + ' ' + id;
1186	956	} else {
1187		- describedBy = `${ id } ${ describedBy }`;
	957	+ describedBy = id + ' ' + describedBy;
1188	958	}
1189	959	}
1190		- input.setAttribute( 'aria-describedby', describedBy );
1191		- } );
1192		- }
1193	960
1194		- inputs.forEach( input => {
1195		- if ( [ 'radio', 'checkbox' ].includes( input.type ) ) {
1196		- const group = input.closest( '[role="radiogroup"], [role="group"]' );
1197		- if ( group ) {
1198		- group.setAttribute( 'aria-invalid', 'true' );
1199		- }
1200		- } else {
1201		- input.setAttribute( 'aria-invalid', 'true' );
	961	+ input.attr( 'aria-describedby', describedBy );
1202	962	}
1203		- } );
	963	+ input.attr( 'aria-invalid', true );
1204	964
1205		- jQuery( document ).trigger( 'frmAddFieldError', [ jQuery( container ), key, jsErrors ] );
	965	+ jQuery( document ).trigger( 'frmAddFieldError', [ $fieldCont, key, jsErrors ]);
	966	+ }
1206	967	}
1207	968
1208	969	/**
1209	970	* Get the ID to use for an error element added when submitting with AJAX.
		@@ -1212,13 +973,13 @@
1212	973	* @param {HTMLElement} input
1213	974	* @return {string} The ID to use for the error element.
1214	975	*/
1215	976	function getErrorElementId( key, input ) {
1216		- if ( isNaN( key ) || ! input || ! input.id ) {
	977	+ if ( isNaN( key ) || ! input.id ) {
1217	978	// If key isn't a number, assume it's already in the right format.
1218		- return `frm_error_field_${ key }`;
	979	+ return 'frm_error_field_' + key;
1219	980	}
1220		- return `frm_error_${ input.id }`;
	981	+ return 'frm_error_' + input.id;
1221	982	}
1222	983
1223	984	/**
1224	985	* Removes errors before validating with JS.
		@@ -1223,72 +984,33 @@
1223	984	/**
1224	985	* Removes errors before validating with JS.
1225	986	* This prevents issues with stale errors that has since been fixed.
1226	987	*
1227		- * @param {HTMLElement|jQuery} fieldCont Field container element.
	988	+ * @param {Object} $fieldCont jQuery object.
1228	989	* @return {void}
1229	990	*/
1230		- function removeFieldError( fieldCont ) {
1231		- const container = fieldCont instanceof jQuery ? fieldCont.get( 0 ) : fieldCont;
1232		- if ( ! container ) {
1233		- return;
1234		- }
	991	+ function removeFieldError( $fieldCont ) {
	992	+ const errorMessage = $fieldCont.find( '.frm_error' );
	993	+ const errorId = errorMessage.attr( 'id' );
	994	+ const input = $fieldCont.find( 'input, select, textarea' );
	995	+ let describedBy = input.attr( 'aria-describedby' );
1235	996
1236		- const errorMessage = container.querySelector( '.frm_error' );
1237		- const input = container.querySelector( 'input, select, textarea' );
	997	+ $fieldCont.get( 0 ).classList.remove( 'frm_blank_field', 'has-error' );
1238	998
1239		- container.classList.remove( 'frm_blank_field', 'has-error' );
	999	+ errorMessage.remove();
	1000	+ input.attr( 'aria-invalid', false );
	1001	+ input.removeAttr( 'aria-describedby' );
1240	1002
1241		- if ( input ) {
1242		- if ( 'true' === input.getAttribute( 'aria-invalid' ) ) {
1243		- input.setAttribute( 'aria-invalid', 'false' );
1244		- } else if ( [ 'radio', 'checkbox' ].includes( input.type ) ) {
1245		- const group = input.closest( '[role="radiogroup"], [role="group"]' );
1246		- if ( group ) {
1247		- group.setAttribute( 'aria-invalid', 'false' );
1248		- }
1249		- }
	1003	+ if ( typeof describedBy !== 'undefined' ) {
	1004	+ describedBy = describedBy.replace( errorId, '' );
	1005	+ input.attr( 'aria-describedby', describedBy );
1250	1006	}
1251		-
1252		- if ( errorMessage ) {
1253		- removeElementFromInputDescribedBy( errorMessage );
1254		- errorMessage.remove();
1255		- }
1256	1007	}
1257	1008
1258		- /**
1259		- * Updates the aria-describedby attribute, removing the target element ID.
1260		- *
1261		- * @since 6.32
1262		- *
1263		- * @param {HTMLElement} el The target element that is removed from the aria-describedby data.
1264		- * @return {void}
1265		- */
1266		- function removeElementFromInputDescribedBy( el ) {
1267		- document.querySelectorAll( `[aria-describedby*="${ el.id }"]` ).forEach( input => {
1268		- let ariaDescribedBy = input.getAttribute( 'aria-describedby' ).split( ' ' );
1269		- ariaDescribedBy = ariaDescribedBy.filter( value => {
1270		- const trimmedValue = value.trim();
1271		- return trimmedValue && trimmedValue !== el.id;
1272		- } );
1273		-
1274		- if ( ariaDescribedBy.length ) {
1275		- input.setAttribute( 'aria-describedby', ariaDescribedBy.join( ' ' ) );
1276		- return;
1277		- }
1278		- input.removeAttribute( 'aria-describedby' );
1279		- } );
1280		- }
1281		-
1282	1009	function removeAllErrors() {
1283		- document.querySelectorAll( '.form-field' ).forEach( field => {
1284		- field.classList.remove( 'frm_blank_field', 'has-error' );
1285		- } );
1286		- document.querySelectorAll( '.form-field .frm_error' ).forEach( el => {
1287		- removeElementFromInputDescribedBy( el );
1288		- el.remove();
1289		- } );
1290		- document.querySelectorAll( '.frm_error_style' ).forEach( error => error.remove() );
	1010	+ jQuery( '.form-field' ).removeClass( 'frm_blank_field has-error' );
	1011	+ jQuery( '.form-field .frm_error' ).replaceWith( '' );
	1012	+ jQuery( '.frm_error_style' ).remove();
1291	1013	}
1292	1014
1293	1015	/**
1294	1016	* @param {HTMLElement|Object} object Form object.
		@@ -1311,9 +1033,9 @@
1311	1033	disableSaveDraft( $object );
1312	1034	}
1313	1035
1314	1036	function showLoadingIndicator( $object ) {
1315		- if ( ! $object.hasClass( 'frm_loading_form' ) && ! $object.hasClass( 'frm_loading_prev' ) ) { // eslint-disable-line no-jquery/no-class, formidable/no-jquery-variable-methods
	1037	+ if ( ! $object.hasClass( 'frm_loading_form' ) && ! $object.hasClass( 'frm_loading_prev' ) ) {
1316	1038	addLoadingClass( $object );
1317	1039	$object.trigger( 'frmStartFormLoading' );
1318	1040	}
1319	1041	}
		@@ -1320,44 +1042,45 @@
1320	1042
1321	1043	function addLoadingClass( $object ) {
1322	1044	const loadingClass = isGoingToPrevPage( $object ) ? 'frm_loading_prev' : 'frm_loading_form';
1323	1045
1324		- $object.addClass( loadingClass ); // eslint-disable-line no-jquery/no-class, formidable/no-jquery-variable-methods
	1046	+ $object.addClass( loadingClass );
1325	1047	}
1326	1048
1327	1049	function isGoingToPrevPage( $object ) {
1328		- return typeof frmProForm !== 'undefined' && frmProForm.goingToPreviousPage( $object );
	1050	+ return ( typeof frmProForm !== 'undefined' && frmProForm.goingToPreviousPage( $object ) );
1329	1051	}
1330	1052
1331		- function removeSubmitLoading( _, enable, processesRunning ) {
	1053	+ function removeSubmitLoading( $object, enable, processesRunning ) {
	1054	+ let loadingForm;
	1055	+
1332	1056	if ( processesRunning > 0 ) {
1333	1057	return;
1334	1058	}
1335	1059
1336		- document.querySelectorAll( '.frm_loading_form' ).forEach( function( form ) {
1337		- form.classList.remove( 'frm_loading_form', 'frm_loading_prev' );
1338		- jQuery( form ).trigger( 'frmEndFormLoading' );
	1060	+ loadingForm = jQuery( '.frm_loading_form' );
	1061	+ loadingForm.removeClass( 'frm_loading_form' );
	1062	+ loadingForm.removeClass( 'frm_loading_prev' );
1339	1063
1340		- if ( enable === 'enable' ) {
1341		- enableSubmitButton( form );
1342		- enableSaveDraft( form );
1343		- }
1344		- } );
	1064	+ loadingForm.trigger( 'frmEndFormLoading' );
	1065	+
	1066	+ if ( enable === 'enable' ) {
	1067	+ enableSubmitButton( loadingForm );
	1068	+ enableSaveDraft( loadingForm );
	1069	+ }
1345	1070	}
1346	1071
1347	1072	function showFileLoading( object ) {
1348		- const loading = document.getElementById( 'frm_loading' );
1349		- if ( ! loading ) {
1350		- return;
	1073	+ let fileval,
	1074	+ loading = document.getElementById( 'frm_loading' );
	1075	+ if ( loading !== null ) {
	1076	+ fileval = jQuery( object ).find( 'input[type=file]' ).val();
	1077	+ if ( typeof fileval !== 'undefined' && fileval !== '' ) {
	1078	+ setTimeout( function() {
	1079	+ jQuery( loading ).fadeIn( 'slow' );
	1080	+ }, 2000 );
	1081	+ }
1351	1082	}
1352		-
1353		- const fileInput = object.querySelector( 'input[type=file]' );
1354		- const fileval = fileInput ? fileInput.value : '';
1355		- if ( fileval !== '' ) {
1356		- setTimeout( function() {
1357		- jQuery( loading ).fadeIn( 'slow' ); // eslint-disable-line no-jquery/no-fade
1358		- }, 2000 );
1359		- }
1360	1083	}
1361	1084
1362	1085	/**********************************************
1363	1086	* General Helpers
		@@ -1364,9 +1087,9 @@
1364	1087	*********************************************/
1365	1088
1366	1089	function confirmClick() {
1367	1090	/*jshint validthis:true */
1368		- const message = this.dataset.frmconfirm;
	1091	+ const message = jQuery( this ).data( 'frmconfirm' );
1369	1092	return confirm( message );
1370	1093	}
1371	1094
1372	1095	/**
		@@ -1374,15 +1097,43 @@
1374	1097	* If this is a match, the User is autofilling the input on a Webkit browser.
1375	1098	* We want to delete the Honeypot field, otherwise it will get triggered as spam on autocomplete.
1376	1099	*/
1377	1100	function onHoneypotFieldChange() {
1378		- /*jshint validthis:true */
1379		- const css = window.getComputedStyle( this ).boxShadow;
1380		- if ( css?.match( /inset/ ) ) {
1381		- this.remove();
	1101	+ const css = jQuery( this ).css( 'box-shadow' );
	1102	+ if ( css.match( /inset/ ) ) {
	1103	+ this.parentNode.removeChild( this );
1382	1104	}
1383	1105	}
1384	1106
	1107	+ function maybeMakeHoneypotFieldsUntabbable() {
	1108	+ document.addEventListener( 'keydown', handleKeyUp );
	1109	+
	1110	+ function handleKeyUp( event ) {
	1111	+ let code;
	1112	+
	1113	+ if ( 'undefined' !== typeof event.key ) {
	1114	+ code = event.key;
	1115	+ } else if ( 'undefined' !== typeof event.keyCode && 9 === event.keyCode ) {
	1116	+ code = 'Tab';
	1117	+ }
	1118	+
	1119	+ if ( 'Tab' === code ) {
	1120	+ makeHoneypotFieldsUntabbable();
	1121	+ document.removeEventListener( 'keydown', handleKeyUp );
	1122	+ }
	1123	+ }
	1124	+
	1125	+ function makeHoneypotFieldsUntabbable() {
	1126	+ document.querySelectorAll( '.frm_verify' ).forEach(
	1127	+ function( input ) {
	1128	+ if ( input.id && 0 === input.id.indexOf( 'frm_email_' ) ) {
	1129	+ input.setAttribute( 'tabindex', -1 );
	1130	+ }
	1131	+ }
	1132	+ );
	1133	+ }
	1134	+ }
	1135	+
1385	1136	/**
1386	1137	* Focus on the first sub field when clicking to the primary label of combo field.
1387	1138	*
1388	1139	* @since 4.10.02
		@@ -1402,59 +1153,33 @@
1402	1153	}
1403	1154
1404	1155	label.addEventListener( 'click', function() {
1405	1156	inputsContainer.querySelector( '.frm_form_field:first-child input, .frm_form_field:first-child select, .frm_form_field:first-child textarea' ).focus();
1406		- } );
1407		- } );
	1157	+ });
	1158	+ });
1408	1159	}
1409	1160
1410		- /**
1411		- * Sets focus on a the first subfield of a combo field that has an error.
1412		- *
1413		- * @since 6.16.3
1414		- *
1415		- * @param {HTMLElement} element
1416		- * @return {boolean} True if the focus was set on a combo field.
1417		- */
1418		- function maybeFocusOnComboSubField( element ) {
1419		- if ( 'FIELDSET' !== element.nodeName ) {
1420		- return false;
1421		- }
1422		- if ( ! element.querySelector( '.frm_combo_inputs_container' ) ) {
1423		- return false;
1424		- }
1425		- const comboSubfield = element.querySelector( '[aria-invalid="true"]' );
1426		- if ( comboSubfield ) {
1427		- focusInput( comboSubfield );
1428		- return true;
1429		- }
1430		- return false;
1431		- }
	1161	+ function checkForErrorsAndMaybeSetFocus() {
	1162	+ let errors, element, timeoutCallback;
1432	1163
1433		- function checkForErrorsAndMaybeSetFocus() {
1434		- if ( ! frm_js.focus_first_error ) {
	1164	+ if ( ! frm_js.focus_first_error ) { // eslint-disable-line camelcase
1435	1165	return;
1436	1166	}
1437	1167
1438		- const errors = document.querySelectorAll( '.frm_form_field .frm_error' );
	1168	+ errors = document.querySelectorAll( '.frm_form_field .frm_error' );
1439	1169	if ( ! errors.length ) {
1440	1170	return;
1441	1171	}
1442	1172
1443		- let element = errors[ 0 ];
1444		- let timeoutCallback;
	1173	+ element = errors[0];
1445	1174	do {
1446	1175	element = element.previousSibling;
1447		- if ( [ 'input', 'select', 'textarea' ].includes( element.nodeName.toLowerCase() ) ) {
1448		- focusInput( element );
	1176	+ if ( -1 !== [ 'input', 'select', 'textarea' ].indexOf( element.nodeName.toLowerCase() ) ) {
	1177	+ element.focus();
1449	1178	break;
1450	1179	}
1451	1180
1452		- if ( maybeFocusOnComboSubField( element ) ) {
1453		- break;
1454		- }
1455		-
1456		- if ( element.classList !== undefined ) {
	1181	+ if ( 'undefined' !== typeof element.classList ) {
1457	1182	if ( element.classList.contains( 'html-active' ) ) {
1458	1183	timeoutCallback = function() {
1459	1184	const textarea = element.querySelector( 'textarea' );
1460	1185	if ( null !== textarea ) {
		@@ -1464,14 +1189,8 @@
1464	1189	} else if ( element.classList.contains( 'tmce-active' ) ) {
1465	1190	timeoutCallback = function() {
1466	1191	tinyMCE.activeEditor.focus();
1467	1192	};
1468		- } else if ( element.classList.contains( 'frm_opt_container' ) ) {
1469		- const firstInput = element.querySelector( 'input' );
1470		- if ( firstInput ) {
1471		- focusInput( firstInput );
1472		- break;
1473		- }
1474	1193	}
1475	1194
1476	1195	if ( 'function' === typeof timeoutCallback ) {
1477	1196	setTimeout( timeoutCallback, 0 );
		@@ -1481,24 +1200,8 @@
1481	1200	} while ( element.previousSibling );
1482	1201	}
1483	1202
1484	1203	/**
1485		- * Focus a visible input, or possibly delay the focus event until the form has faded in.
1486		- *
1487		- * @since 6.16.3
1488		- *
1489		- * @param {HTMLElement} input
1490		- * @return {void}
1491		- */
1492		- function focusInput( input ) {
1493		- if ( input.offsetParent !== null ) {
1494		- input.focus();
1495		- } else {
1496		- triggerCustomEvent( document, 'frmMaybeDelayFocus', { input } );
1497		- }
1498		- }
1499		-
1500		- /**
1501	1204	* Does the same as jQuery( document ).on( 'event', 'selector', handler ).
1502	1205	*
1503	1206	* @since 5.4
1504	1207	*
		@@ -1507,9 +1210,9 @@
1507	1210	* @param {Function} handler Handler.
1508	1211	* @param {boolean | Object} options Options to be added to `addEventListener()` method. Default is `false`.
1509	1212	*/
1510	1213	function documentOn( event, selector, handler, options ) {
1511		- if ( options === undefined ) {
	1214	+ if ( 'undefined' === typeof options ) {
1512	1215	options = false;
1513	1216	}
1514	1217
1515	1218	document.addEventListener( event, function( e ) {
		@@ -1516,9 +1219,9 @@
1516	1219	let target;
1517	1220
1518	1221	// loop parent nodes from the target to the delegation node.
1519	1222	for ( target = e.target; target && target != this; target = target.parentNode ) {
1520		- if ( target.matches && target.matches( selector ) ) {
	1223	+ if ( target && target.matches && target.matches( selector ) ) {
1521	1224	handler.call( target, e );
1522	1225	break;
1523	1226	}
1524	1227	}
		@@ -1525,23 +1228,27 @@
1525	1228	}, options );
1526	1229	}
1527	1230
1528	1231	function initFloatingLabels() {
1529		- const selector = '.frm-show-form .frm_inside_container input, .frm-show-form .frm_inside_container select, .frm-show-form .frm_inside_container textarea';
1530		- const floatClass = 'frm_label_float_top';
	1232	+ let checkFloatLabel, checkDropdownLabel, runOnLoad, selector, floatClass;
1531	1233
1532		- const checkFloatLabel = function( input ) {
1533		- const container = input.closest( '.frm_inside_container' );
	1234	+ selector = '.frm-show-form .frm_inside_container input, .frm-show-form .frm_inside_container select, .frm-show-form .frm_inside_container textarea';
	1235	+ floatClass = 'frm_label_float_top';
	1236	+
	1237	+ checkFloatLabel = function( input ) {
	1238	+ let container, shouldFloatTop, firstOpt;
	1239	+
	1240	+ container = input.closest( '.frm_inside_container' );
1534	1241	if ( ! container ) {
1535	1242	return;
1536	1243	}
1537	1244
1538		- const shouldFloatTop = input.value || document.activeElement === input;
	1245	+ shouldFloatTop = input.value || document.activeElement === input;
1539	1246
1540	1247	container.classList.toggle( floatClass, shouldFloatTop );
1541	1248
1542	1249	if ( 'SELECT' === input.tagName ) {
1543		- const firstOpt = input.querySelector( 'option:first-child' );
	1250	+ firstOpt = input.querySelector( 'option:first-child' );
1544	1251
1545	1252	if ( shouldFloatTop ) {
1546	1253	if ( firstOpt.hasAttribute( 'data-label' ) ) {
1547	1254	firstOpt.textContent = firstOpt.getAttribute( 'data-label' );
		@@ -1553,10 +1260,10 @@
1553	1260	}
1554	1261	}
1555	1262	};
1556	1263
1557		- const checkDropdownLabel = function() {
1558		- document.querySelectorAll( `.frm-show-form .frm_inside_container:not(.${ floatClass }) select` ).forEach( function( input ) {
	1264	+ checkDropdownLabel = function() {
	1265	+ document.querySelectorAll( '.frm-show-form .frm_inside_container:not(.' + floatClass + ') select' ).forEach( function( input ) {
1559	1266	const firstOpt = input.querySelector( 'option:first-child' );
1560	1267
1561	1268	if ( firstOpt.textContent ) {
1562	1269	firstOpt.setAttribute( 'data-label', firstOpt.textContent );
		@@ -1561,9 +1268,9 @@
1561	1268	if ( firstOpt.textContent ) {
1562	1269	firstOpt.setAttribute( 'data-label', firstOpt.textContent );
1563	1270	firstOpt.textContent = '';
1564	1271	}
1565		- } );
	1272	+ });
1566	1273	};
1567	1274
1568	1275	[ 'focus', 'blur', 'change' ].forEach( function( eventName ) {
1569	1276	documentOn(
		@@ -1573,12 +1280,16 @@
1573	1280	checkFloatLabel( event.target );
1574	1281	},
1575	1282	true
1576	1283	);
1577		- } );
	1284	+ });
1578	1285
1579		- const runOnLoad = function( firstLoad ) {
1580		- if ( firstLoad && document.activeElement && [ 'INPUT', 'SELECT', 'TEXTAREA' ].includes( document.activeElement.tagName ) ) {
	1286	+ jQuery( document ).on( 'change', selector, function( event ) {
	1287	+ checkFloatLabel( event.target );
	1288	+ });
	1289	+
	1290	+ runOnLoad = function( firstLoad ) {
	1291	+ if ( firstLoad && document.activeElement && -1 !== [ 'INPUT', 'SELECT', 'TEXTAREA' ].indexOf( document.activeElement.tagName ) ) {
1581	1292	checkFloatLabel( document.activeElement );
1582	1293	} else if ( firstLoad ) {
1583	1294	document.querySelectorAll( '.frm_inside_container' ).forEach(
1584	1295	function( container ) {
		@@ -1590,9 +1301,8 @@
1590	1301	);
1591	1302	}
1592	1303
1593	1304	checkDropdownLabel();
1594		- calcProductsTotal();
1595	1305	};
1596	1306
1597	1307	runOnLoad( true );
1598	1308
		@@ -1597,13 +1307,13 @@
1597	1307	runOnLoad( true );
1598	1308
1599	1309	jQuery( document ).on( 'frmPageChanged', function( event ) {
1600	1310	runOnLoad();
1601		- } );
	1311	+ });
1602	1312
1603	1313	document.addEventListener( 'frm_after_start_over', function( event ) {
1604	1314	runOnLoad();
1605		- } );
	1315	+ });
1606	1316	}
1607	1317
1608	1318	function shouldUpdateValidityMessage( target ) {
1609	1319	if ( 'INPUT' !== target.nodeName ) {
		@@ -1625,10 +1335,10 @@
1625	1335	return true;
1626	1336	}
1627	1337
1628	1338	function maybeClearCustomValidityMessage( event, field ) {
1629		- let key;
1630		- let isInvalid = false;
	1339	+ let key,
	1340	+ isInvalid = false;
1631	1341
1632	1342	if ( ! shouldUpdateValidityMessage( field ) ) {
1633	1343	return;
1634	1344	}
		@@ -1640,9 +1350,9 @@
1640	1350	if ( 'valid' !== key && field.validity[ key ] === true ) {
1641	1351	isInvalid = true;
1642	1352	break;
1643	1353	}
1644		- }
	1354	+ };
1645	1355
1646	1356	if ( ! isInvalid ) {
1647	1357	field.setCustomValidity( '' );
1648	1358	}
		@@ -1648,29 +1358,33 @@
1648	1358	}
1649	1359	}
1650	1360
1651	1361	function maybeShowNewTabFallbackMessage() {
	1362	+ let messageEl;
	1363	+
1652	1364	if ( ! window.frmShowNewTabFallback ) {
1653	1365	return;
1654	1366	}
1655	1367
1656		- const messageEl = document.querySelector( `#frm_form_${ frmShowNewTabFallback.formId }_container .frm_message` );
	1368	+ messageEl = document.querySelector( '#frm_form_' + frmShowNewTabFallback.formId + '_container .frm_message' );
1657	1369	if ( ! messageEl ) {
1658	1370	return;
1659	1371	}
1660	1372
1661		- messageEl.insertAdjacentHTML( 'beforeend', ` ${ frmShowNewTabFallback.message }` );
	1373	+ messageEl.insertAdjacentHTML( 'beforeend', ' ' + frmShowNewTabFallback.message );
1662	1374	}
1663	1375
1664	1376	function setCustomValidityMessage() {
1665		- const forms = document.getElementsByClassName( 'frm-show-form' );
1666		- const { length } = forms;
	1377	+ let forms, length, index;
1667	1378
1668		- for ( let index = 0; index < length; ++index ) {
	1379	+ forms = document.getElementsByClassName( 'frm-show-form' );
	1380	+ length = forms.length;
	1381	+
	1382	+ for ( index = 0; index < length; ++index ) {
1669	1383	forms[ index ].addEventListener(
1670	1384	'invalid',
1671	1385	function( event ) {
1672		- const { target } = event;
	1386	+ const target = event.target;
1673	1387
1674	1388	if ( shouldUpdateValidityMessage( target ) ) {
1675	1389	target.setCustomValidity( target.dataset.invmsg );
1676	1390	}
		@@ -1684,14 +1398,14 @@
1684	1398	window.addEventListener( 'pageshow', function( event ) {
1685	1399	if ( event.persisted ) {
1686	1400	document.querySelectorAll( '.frm_loading_form' ).forEach(
1687	1401	function( form ) {
1688		- enableSubmitButton( form );
	1402	+ enableSubmitButton( jQuery( form ) );
1689	1403	}
1690	1404	);
1691	1405	removeSubmitLoading();
1692	1406	}
1693		- } );
	1407	+ });
1694	1408	}
1695	1409
1696	1410	/**
1697	1411	* Destroys the formidable generated global hcaptcha object since it wouldn't otherwise render.
		@@ -1702,503 +1416,23 @@
1702	1416	}
1703	1417	window.hcaptcha = null;
1704	1418	}
1705	1419
1706		- /**
1707		- * @since 6.16.3
1708		- *
1709		- * @return {string} Unique key, used for duplicate checks.
1710		- */
1711		- function getUniqueKey() {
1712		- const uniqueKey = Array.from( window.crypto.getRandomValues( new Uint8Array( 8 ) ) )
1713		- .map( b => b.toString( 16 ).padStart( 2, '0' ) )
1714		- .join( '' );
1715		- const timestamp = Date.now().toString( 16 );
1716		- return `${ uniqueKey }-${ timestamp }`;
1717		- }
1718		-
1719		- /**
1720		- * Animates the scroll position of the document.
1721		- *
1722		- * @since 6.20
1723		- *
1724		- * @param {number} start
1725		- * @param {number} end
1726		- * @param {number} duration
1727		- * @return {void}
1728		- */
1729		- function animateScroll( start, end, duration ) {
1730		- if ( ! window.hasOwnProperty( 'performance' ) || ! window.hasOwnProperty( 'requestAnimationFrame' ) ) {
1731		- document.documentElement.scrollTop = end;
1732		- return;
1733		- }
1734		-
1735		- const startTime = performance.now();
1736		- const step = currentTime => {
1737		- const progress = Math.min( ( currentTime - startTime ) / duration, 1 );
1738		- document.documentElement.scrollTop = start + ( ( end - start ) * progress );
1739		- if ( progress < 1 ) {
1740		- requestAnimationFrame( step );
1741		- }
1742		- };
1743		- requestAnimationFrame( step );
1744		- }
1745		-
1746		- /**
1747		- * Make sure that the captcha label for a reCAPTCHA or Turnstile field matches the response input ID.
1748		- * This is determined dynamically, so we check for the ID after the input is rendered.
1749		- * hCaptcha is handled separately, in the frmCaptcha function as it is not rendered explicitly.
1750		- *
1751		- * @since 6.25.1
1752		- *
1753		- * @param {HTMLElement} captcha
1754		- * @return {void}
1755		- */
1756		- function maybeFixCaptchaLabel( captcha ) {
1757		- const form = captcha.closest( 'form' );
1758		- if ( ! form ) {
1759		- return;
1760		- }
1761		-
1762		- const label = form.querySelector( 'label[for="g-recaptcha-response"], label[for="cf-turnstile-response"]' );
1763		- const captchaResponse = form.querySelector( '[name="g-recaptcha-response"], [name="cf-turnstile-response"]' );
1764		-
1765		- if ( label && captchaResponse ) {
1766		- label.htmlFor = captchaResponse.id;
1767		- }
1768		- }
1769		-
1770		- /**
1771		- * Check to make sure the quantity field value is within the min and max values.
1772		- *
1773		- * @param {HTMLElement} input
1774		- * @return {number} The quantity value.
1775		- */
1776		- function checkQuantityFieldMinMax( input ) {
1777		- if ( '' === input.value ) {
1778		- // Leave the value if it is empty.
1779		- return 0;
1780		- }
1781		-
1782		- const val = parseFloat( input.value ? input.value.trim() : 0 );
1783		- if ( isNaN( val ) ) {
1784		- return 0;
1785		- }
1786		-
1787		- let max = input.hasAttribute( 'max' ) ? parseFloat( input.getAttribute( 'max' ) ) : 0;
1788		- let min = input.hasAttribute( 'min' ) ? parseFloat( input.getAttribute( 'min' ) ) : 0;
1789		-
1790		- max = isNaN( max ) ? 0 : max;
1791		- min = isNaN( min ) ? 0 : Math.max( 0, min );
1792		-
1793		- if ( val < min ) {
1794		- input.value = min;
1795		- return min;
1796		- }
1797		-
1798		- if ( 0 !== max && val > max ) {
1799		- input.value = max;
1800		- return max;
1801		- }
1802		-
1803		- return val;
1804		- }
1805		-
1806		- function triggerChange( input, fieldKey ) {
1807		- if ( fieldKey === undefined ) {
1808		- fieldKey = 'dependent';
1809		- }
1810		-
1811		- jQuery( input ).trigger( { type: 'change', selfTriggered: true, frmTriggered: fieldKey } );
1812		- }
1813		-
1814		- /**
1815		- * Calculates the total price.
1816		- *
1817		- * @param {Event|undefined} e The event object.
1818		- * @return {void}
1819		- */
1820		- function calcProductsTotal( e ) {
1821		- if ( 'object' === typeof frmProForm ) {
1822		- // Pro is installed, use the Pro JS.
1823		- return;
1824		- }
1825		-
1826		- if ( typeof __FRMCURR === 'undefined' ) {
1827		- return;
1828		- }
1829		-
1830		- const totalFields = document.querySelectorAll( '[data-frmtotal]' );
1831		- if ( ! totalFields.length ) {
1832		- return;
1833		- }
1834		-
1835		- const formTotals = [];
1836		-
1837		- totalFields.forEach( totalField => {
1838		- let total = 0;
1839		- const form = totalField.closest( 'form' );
1840		-
1841		- if ( ! form ) {
1842		- return;
1843		- }
1844		-
1845		- const formId = form.querySelector( 'input[name="form_id"]' ).value;
1846		- const currency = getCurrency( formId );
1847		-
1848		- if ( undefined !== formTotals[ formId ] ) {
1849		- total = formTotals[ formId ];
1850		- } else {
1851		- form.querySelectorAll( 'input[data-frmprice],select:has([data-frmprice])' ).forEach( function( input ) {
1852		- let quantity = 0;
1853		- let price = 0;
1854		- const isSingle = 'hidden' === input.type;
1855		-
1856		- if ( input.tagName === 'SELECT' ) {
1857		- if ( input.selectedIndex !== -1 ) {
1858		- price = input.options[ input.selectedIndex ].getAttribute( 'data-frmprice' );
1859		- }
1860		- } else {
1861		- if ( ! isSingle && ! input.matches( ':checked' ) ) {
1862		- return;
1863		- }
1864		- price = input.getAttribute( 'data-frmprice' );
1865		- }
1866		-
1867		- if ( ! price ) {
1868		- price = 0;
1869		- } else {
1870		- price = preparePrice( price, currency );
1871		- quantity = getQuantity( input );
1872		- price = parseFloat( quantity ) * parseFloat( price );
1873		- }
1874		-
1875		- if ( 'true' === input.getAttribute( 'data-frmdiscount' ) ) {
1876		- price = price * -1;
1877		- }
1878		-
1879		- total += price;
1880		- } );
1881		-
1882		- formTotals[ formId ] = total;
1883		- }
1884		-
1885		- total = isNaN( total ) ? 0 : total;
1886		-
1887		- // Set a decimal separator for currency if no default for it
1888		- currency.decimal_separator = currency.decimal_separator.trim(); // first remove unnecessary space(s)
1889		- if ( ! currency.decimal_separator.length ) {
1890		- currency.decimal_separator = '.';
1891		- }
1892		-
1893		- totalField.value = roundTotal( total, currency );
1894		- total = normalizeTotal( total, currency );
1895		-
1896		- // because of e.g. fields that might be using this field for calculations
1897		- triggerChange( totalField );
1898		-
1899		- total = formatCurrency( total, currency );
1900		- const formatted = totalField.previousElementSibling;
1901		- if ( formatted?.matches( '.frm_total_formatted' ) ) {
1902		- // Use innerHTML so that currency symbols like Euros can render and not their encoded string value.
1903		- formatted.innerHTML = total;
1904		- return;
1905		- }
1906		-
1907		- const formattedEls = totalField.closest( '.frm_form_field' ).querySelectorAll( '.frm_total_formatted' );
1908		- formattedEls.forEach( formattedEl => {
1909		- // Use innerHTML so that currency symbols like Euros can render and not their encoded string value.
1910		- formattedEl.innerHTML = total;
1911		- } );
1912		- } );
1913		- }
1914		-
1915		- /**
1916		- * Round total and maybe add trailing zeros so formatCurrency has a proper format to work with.
1917		- *
1918		- * @param {number} total The total amount to normalize.
1919		- * @param {Object} currency The currency object containing decimal information.
1920		- * @return {string} The normalized total amount.
1921		- */
1922		- function normalizeTotal( total, currency ) {
1923		- const isLargeTotal = total > Number.MAX_SAFE_INTEGER;
1924		-
1925		- total = roundTotal( total, currency );
1926		-
1927		- return maybeAddTrailingZeroToPrice( total, currency, isLargeTotal );
1928		- }
1929		-
1930		- function roundTotal( total, currency ) {
1931		- const isLargeTotal = total > Number.MAX_SAFE_INTEGER;
1932		-
1933		- if ( ! isLargeTotal ) {
1934		- const { decimals } = currency;
1935		- total = decimals > 0 ? round10( total, decimals ) : Math.ceil( total );
1936		- }
1937		-
1938		- return total;
1939		- }
1940		-
1941		- function round10( value, decimals ) {
1942		- return Number( `${ Math.round( `${ value }e${ decimals }` ) }e-${ decimals }` );
1943		- }
1944		-
1945		- /**
1946		- * Format a numeric value according to the specified currency format settings.
1947		- *
1948		- * @param {string} total The numeric value to format.
1949		- * @param {Object} currency The currency formatting configuration.
1950		- * @return {string} The formatted currency string.
1951		- */
1952		- function formatCurrency( total, currency ) {
1953		- total = maybeAddTrailingZeroToPrice( total, currency );
1954		- if ( total.length && ( total[ total.length - 1 ] === '.' || total[ total.length - 1 ] === currency.decimal_separator ) ) {
1955		- total = total.substr( 0, total.length - 1 );
1956		- }
1957		-
1958		- total = maybeRemoveTrailingZerosFromPrice( total, currency );
1959		- total = addThousands( total, currency );
1960		-
1961		- const leftSymbol = currency.symbol_left ? ( currency.symbol_left + currency.symbol_padding ) : '';
1962		- const rightSymbol = currency.symbol_right ? ( currency.symbol_padding + currency.symbol_right ) : '';
1963		-
1964		- return `${ leftSymbol }${ total }${ rightSymbol }`;
1965		- }
1966		-
1967		- /**
1968		- * Gets currency from form id.
1969		- *
1970		- * @param {number} formId Form ID.
1971		- * @return {Object} Currency object.
1972		- */
1973		- function getCurrency( formId ) {
1974		- if ( undefined !== window.__FRMCURR && undefined !== window.__FRMCURR[ formId ] ) {
1975		- return window.__FRMCURR[ formId ];
1976		- }
1977		-
1978		- return {
1979		- symbol_left: '$',
1980		- symbol_right: '',
1981		- symbol_padding: '',
1982		- thousand_separator: ',',
1983		- decimal_separator: '.',
1984		- decimals: 2,
1985		- };
1986		- }
1987		-
1988		- /**
1989		- * Gets quantity.
1990		- *
1991		- * @param {HTMLElement} field The field element.
1992		- * @return {number} The quantity.
1993		- */
1994		- function getQuantity( field ) {
1995		- const fieldID = frmFrontForm.getFieldId( field, false );
1996		- if ( ! fieldID ) {
1997		- return 0;
1998		- }
1999		-
2000		- const quantityField = getQuantityField( field, fieldID );
2001		- if ( ! quantityField ) {
2002		- // If there is no quantity field, assume 1.
2003		- return 1;
2004		- }
2005		-
2006		- return checkQuantityFieldMinMax( quantityField );
2007		- }
2008		-
2009		- /**
2010		- * Gets quantity field.
2011		- *
2012		- * @param {HTMLElement} element The element.
2013		- * @param {number} fieldID The field ID.
2014		- * @return {HTMLElement|null} The quantity field.
2015		- */
2016		- function getQuantityField( element, fieldID ) {
2017		- const quantityFields = element.closest( 'form' ).querySelectorAll( '[data-frmproduct]' );
2018		- if ( ! quantityFields.length ) {
2019		- return null;
2020		- }
2021		-
2022		- fieldID = fieldID.toString();
2023		-
2024		- return Array.from( quantityFields ).find( element => {
2025		- let ids;
2026		-
2027		- ids = JSON.parse( element.getAttribute( 'data-frmproduct' ).trim() );
2028		- if ( '' === ids ) {
2029		- return false;
2030		- }
2031		-
2032		- // Convert to array if necessary because of existing fields that are already using single product fields.
2033		- ids = 'string' === typeof ids ? [ ids ] : ids;
2034		- return ids.includes( fieldID );
2035		- } );
2036		- }
2037		-
2038		- /**
2039		- * Prepare a price for calculation.
2040		- *
2041		- * @param {number|string} price The price to prepare.
2042		- * @param {Object} currency The currency object containing decimal information.
2043		- * @return {string} The prepared price.
2044		- */
2045		- function preparePrice( price, currency ) {
2046		- if ( ! price ) {
2047		- return 0;
2048		- }
2049		- price = `${ price }`; // convert to string just to be sure
2050		-
2051		- const regex = getRegexForPrice( currency );
2052		-
2053		- const matches = price.match( regex );
2054		- if ( null === matches ) {
2055		- return 0;
2056		- }
2057		-
2058		- price = matches.length ? matches[ matches.length - 1 ] : 0;
2059		- price = price.trim();
2060		-
2061		- // Fix issues with parsing Fr.15.00. The regex catches .15.00.
2062		- // This checks for the leading decimal and removes it.
2063		- if ( currency.decimal_separator === '.' && 3 === price.split( '.' ).length && price[ 0 ] === '.' ) {
2064		- price = price.substr( 1 );
2065		- }
2066		-
2067		- if ( price ) {
2068		- price = maybeUseDecimal( price, currency );
2069		- price = price.split( currency.thousand_separator ).join( '' ).replace( currency.decimal_separator, '.' );
2070		- }
2071		-
2072		- return price;
2073		- }
2074		-
2075		- /**
2076		- * @param {Object} currency The currency object.
2077		- * @return {RegExp} The regular expression object.
2078		- */
2079		- function getRegexForPrice( currency ) {
2080		- let regexString = '[0-9,.';
2081		-
2082		- if ( currency.thousand_separator !== '.' && currency.thousand_separator !== ',' ) {
2083		- regexString += currency.thousand_separator;
2084		- }
2085		- if ( currency.decimal_separator !== '.' && currency.decimal_separator !== ',' ) {
2086		- regexString += currency.decimal_separator;
2087		- }
2088		-
2089		- regexString += ']*\\.?\\,?[0-9]+';
2090		-
2091		- return new RegExp( regexString, 'g' );
2092		- }
2093		-
2094		- /**
2095		- * Maybe replace the decimal separator with the currency's decimal separator.
2096		- *
2097		- * @param {string} price The price string.
2098		- * @param {Object} currency The currency object.
2099		- * @return {string} The modified price string.
2100		- */
2101		- function maybeUseDecimal( price, currency ) {
2102		- let usedForDecimal;
2103		- let priceParts;
2104		- if ( '.' === currency.thousand_separator ) {
2105		- priceParts = price.split( '.' );
2106		- usedForDecimal = 2 === priceParts.length && 2 === priceParts[ 1 ].length;
2107		- if ( usedForDecimal ) {
2108		- price = price.replace( '.', currency.decimal_separator );
2109		- }
2110		- }
2111		- return price;
2112		- }
2113		-
2114		- /**
2115		- * Add trailing zeros to a price if necessary and replace the decimal separator.
2116		- *
2117		- * @param {number|string} price The price to format.
2118		- * @param {Object} currency The currency object containing the decimal separator.
2119		- * @param {boolean} [force=false] Whether to force processing even if the price is not a number.
2120		- * @return {string} The formatted price string.
2121		- */
2122		- function maybeAddTrailingZeroToPrice( price, currency, force = false ) {
2123		- if ( 'number' !== typeof price && ! force ) {
2124		- return price;
2125		- }
2126		-
2127		- price = String( price ); // first convert to string
2128		- const pos = price.indexOf( '.' );
2129		-
2130		- if ( pos === -1 ) {
2131		- price = `${ price }.`;
2132		-
2133		- for ( let n = 0; n < currency.decimals; ++n ) {
2134		- price += '0';
2135		- }
2136		- } else {
2137		- const decimalsString = price.substring( pos + 1 );
2138		- if ( decimalsString.length < currency.decimals ) {
2139		- if ( decimalsString.length < 2 ) {
2140		- price += '0';
2141		- }
2142		-
2143		- for ( let n = 2; n < currency.decimals; ++n ) {
2144		- price += '0';
2145		- }
2146		- }
2147		- }
2148		-
2149		- return price.replace( '.', currency.decimal_separator );
2150		- }
2151		-
2152		- /**
2153		- * Format a numeric string by adding thousand separators.
2154		- *
2155		- * @param {string|number} price The numeric value to format.
2156		- * @param {Object} options Formatting options.
2157		- * @param {string} options.decimal_separator Character used as decimal separator.
2158		- * @param {string} options.thousand_separator Character used as thousand separator.
2159		- *
2160		- * @return {string} The price string with thousand separators.
2161		- */
2162		- function addThousands( price, options ) {
2163		- const split = options.decimal_separator === ''
2164		- ? [ price.toString() ]
2165		- : price.split( options.decimal_separator );
2166		-
2167		- if ( options.thousand_separator ) {
2168		- split[ 0 ] = split[ 0 ].replace( /\B(?=(\d{3})+(?!\d))/g, options.thousand_separator );
2169		- }
2170		-
2171		- return split.join( options.decimal_separator );
2172		- }
2173		-
2174		- /**
2175		- * Maybe remove trailing zeros from a price string.
2176		- *
2177		- * @param {string} price The price string.
2178		- * @param {Object} currency The currency data.
2179		- *
2180		- * @return {string} The price string with trailing zeros removed.
2181		- */
2182		- function maybeRemoveTrailingZerosFromPrice( price, currency ) {
2183		- const split = price.split( currency.decimal_separator );
2184		- if ( 2 !== split.length || split[ 1 ].length <= currency.decimals ) {
2185		- return price;
2186		- }
2187		- if ( 0 === currency.decimals ) {
2188		- return split[ 0 ];
2189		- }
2190		- return `${ split[ 0 ] }${ currency.decimal_separator }${ split[ 1 ].substr( 0, currency.decimals ) }`;
2191		- }
2192		-
2193	1420	return {
2194		- init() {
	1421	+ init: function() {
2195	1422	jQuery( document ).off( 'submit.formidable', '.frm-show-form' );
2196	1423	jQuery( document ).on( 'submit.formidable', '.frm-show-form', frmFrontForm.submitForm );
2197	1424
	1425	+ jQuery( '.frm-show-form input[onblur], .frm-show-form textarea[onblur]' ).each( function() {
	1426	+ if ( jQuery( this ).val() === '' ) {
	1427	+ jQuery( this ).trigger( 'blur' );
	1428	+ }
	1429	+ });
	1430	+
2198	1431	jQuery( document ).on( 'change', '.frm-show-form input[name^="item_meta"], .frm-show-form select[name^="item_meta"], .frm-show-form textarea[name^="item_meta"]', frmFrontForm.fieldValueChanged );
2199	1432
2200		- jQuery( document ).on( 'change', '.frm_verify[id^=field_]', onHoneypotFieldChange );
	1433	+ jQuery( document ).on( 'change', '[id^=frm_email_]', onHoneypotFieldChange );
	1434	+ maybeMakeHoneypotFieldsUntabbable();
2201	1435
2202	1436	jQuery( document ).on( 'click', 'a[data-frmconfirm]', confirmClick );
2203	1437
2204	1438	checkForErrorsAndMaybeSetFocus();
		@@ -2222,81 +1456,71 @@
2222	1456	jQuery( document ).on(
2223	1457	'frmPageChanged',
2224	1458	destroyhCaptcha
2225	1459	);
	1460	+ },
2226	1461
2227		- jQuery( document ).on( 'frmAfterAddRow frmAfterRemoveRow', calcProductsTotal );
2228		- jQuery( document ).on( 'change', '[type="checkbox"][data-frmprice],[type="radio"][data-frmprice],[type="hidden"][data-frmprice],select:has([data-frmprice])', calcProductsTotal );
2229		- jQuery( document ).on( 'keyup change', '[data-frmproduct],[type="text"][data-frmprice]', calcProductsTotal );
2230		- calcProductsTotal();
	1462	+ getFieldId: function( field, fullID ) {
	1463	+ return getFieldId( field, fullID );
2231	1464	},
2232	1465
2233		- getFieldId,
	1466	+ renderCaptcha: function( captcha, captchaSelector ) {
	1467	+ let formID, captchaID,
	1468	+ size = captcha.getAttribute( 'data-size' ),
	1469	+ rendered = captcha.getAttribute( 'data-rid' ) !== null,
	1470	+ params = {
	1471	+ 'sitekey': captcha.getAttribute( 'data-sitekey' ),
	1472	+ 'size': size,
	1473	+ 'theme': captcha.getAttribute( 'data-theme' )
	1474	+ },
	1475	+ activeCaptcha = getSelectedCaptcha( captchaSelector ),
	1476	+ captchaContainer = typeof turnstile !== 'undefined' && turnstile === activeCaptcha ? '#' + captcha.id : captcha.id;
2234	1477
2235		- /**
2236		- * Render a captcha field.
2237		- *
2238		- * @param {HTMLElement} captcha
2239		- * @param {string} captchaSelector
2240		- * @return {void}
2241		- */
2242		- renderCaptcha( captcha, captchaSelector ) {
2243		- const rendered = captcha.getAttribute( 'data-rid' ) !== null;
2244	1478	if ( rendered ) {
2245	1479	return;
2246	1480	}
2247	1481
2248		- const size = captcha.getAttribute( 'data-size' );
2249		- const params = {
2250		- sitekey: captcha.getAttribute( 'data-sitekey' ),
2251		- size,
2252		- theme: captcha.getAttribute( 'data-theme' )
2253		- };
2254		-
2255	1482	if ( size === 'invisible' ) {
2256		- const formID = captcha.closest( 'form' )?.querySelector( 'input[name="form_id"]' )?.value;
2257		-
2258		- const captchaLabel = captcha.closest( '.frm_form_field' )?.querySelector( '.frm_primary_label' );
2259		- if ( captchaLabel ) {
2260		- captchaLabel.style.display = 'none';
2261		- }
2262		-
	1483	+ formID = jQuery( captcha ).closest( 'form' ).find( 'input[name="form_id"]' ).val();
	1484	+ jQuery( captcha ).closest( '.frm_form_field .frm_primary_label' ).hide();
2263	1485	params.callback = function( token ) {
2264	1486	frmFrontForm.afterRecaptcha( token, formID );
2265	1487	};
2266	1488	}
2267	1489
2268		- const activeCaptcha = getSelectedCaptcha( captchaSelector );
2269		- const captchaContainer = typeof turnstile !== 'undefined' && turnstile === activeCaptcha ? `#${ captcha.id }` : captcha.id;
2270		- const captchaID = activeCaptcha.render( captchaContainer, params );
2271	1490
	1491	+ captchaID = activeCaptcha.render( captchaContainer, params );
	1492	+
2272	1493	captcha.setAttribute( 'data-rid', captchaID );
2273		-
2274		- maybeFixCaptchaLabel( captcha );
2275	1494	},
2276	1495
2277		- afterSingleRecaptcha() {
2278		- const recaptcha = document.querySelector( '.frm-show-form .g-recaptcha' );
2279		- const object = recaptcha ? recaptcha.closest( 'form' ) : null;
	1496	+ afterSingleRecaptcha: function() {
	1497	+ const object = jQuery( '.frm-show-form .g-recaptcha' ).closest( 'form' )[0];
2280	1498	frmFrontForm.submitFormNow( object );
2281	1499	},
2282	1500
2283		- afterRecaptcha( _, formID ) {
2284		- const object = document.querySelector( `#frm_form_${ formID }_container form` );
	1501	+ afterRecaptcha: function( _, formID ) {
	1502	+ const object = jQuery( '#frm_form_' + formID + '_container form' )[0];
2285	1503	frmFrontForm.submitFormNow( object );
2286	1504	},
2287	1505
2288		- submitForm( e ) {
	1506	+ submitForm: function( e ) {
2289	1507	frmFrontForm.submitFormManual( e, this );
2290	1508	},
2291	1509
2292		- /**
2293		- * @param {Event} e
2294		- * @param {HTMLElement} object The form object that is being submitted.
2295		- * @return {void}
2296		- */
2297		- submitFormManual( e, object ) {
2298		- if ( document.body.classList.contains( 'wp-admin' ) && ! object.closest( '.frmapi-form' ) ) {
	1510	+ submitFormManual: function( e, object ) {
	1511	+ let isPro, errors,
	1512	+ invisibleRecaptcha = hasInvisibleRecaptcha( object ),
	1513	+ classList = object.className.trim().split( /\s+/gi );
	1514	+
	1515	+ if ( classList && invisibleRecaptcha.length < 1 ) {
	1516	+ isPro = classList.indexOf( 'frm_pro_form' ) > -1;
	1517	+ if ( ! isPro ) {
	1518	+ return;
	1519	+ }
	1520	+ }
	1521	+
	1522	+ if ( jQuery( 'body' ).hasClass( 'wp-admin' ) && jQuery( object ).closest( '.frmapi-form' ).length < 1 ) {
2299	1523	return;
2300	1524	}
2301	1525
2302	1526	e.preventDefault();
		@@ -2304,29 +1528,26 @@
2304	1528	if ( typeof frmProForm !== 'undefined' && typeof frmProForm.submitAllowed === 'function' && ! frmProForm.submitAllowed( object ) ) {
2305	1529	return;
2306	1530	}
2307	1531
2308		- const errors = frmFrontForm.validateFormSubmit( object );
2309		- if ( Object.keys( errors ).length !== 0 ) {
2310		- return;
2311		- }
2312		-
2313		- const invisibleRecaptcha = hasInvisibleRecaptcha( object );
2314		-
2315		- if ( invisibleRecaptcha ) {
	1532	+ if ( invisibleRecaptcha.length ) {
2316	1533	showLoadingIndicator( jQuery( object ) );
2317	1534	executeInvisibleRecaptcha( invisibleRecaptcha );
2318	1535	} else {
2319		- showSubmitLoading( jQuery( object ) );
2320	1536
2321		- frmFrontForm.submitFormNow( object );
	1537	+ errors = frmFrontForm.validateFormSubmit( object );
	1538	+
	1539	+ if ( Object.keys( errors ).length === 0 ) {
	1540	+ showSubmitLoading( jQuery( object ) );
	1541	+
	1542	+ frmFrontForm.submitFormNow( object, classList );
	1543	+ }
2322	1544	}
2323	1545	},
2324	1546
2325		- submitFormNow( object ) {
2326		- let hasFileFields;
2327		- let antispamInput;
2328		- const classList = object.className.trim().split( /\s+/gi );
	1547	+ submitFormNow: function( object ) {
	1548	+ let hasFileFields, antispamInput,
	1549	+ classList = object.className.trim().split( /\s+/gi );
2329	1550
2330	1551	if ( object.hasAttribute( 'data-token' ) && null === object.querySelector( '[name="antispam_token"]' ) ) {
2331	1552	// include the antispam token on form submit.
2332	1553	antispamInput = document.createElement( 'input' );
		@@ -2332,24 +1553,17 @@
2332	1553	antispamInput = document.createElement( 'input' );
2333	1554	antispamInput.type = 'hidden';
2334	1555	antispamInput.name = 'antispam_token';
2335	1556	antispamInput.value = object.getAttribute( 'data-token' );
2336		- object.append( antispamInput );
	1557	+ object.appendChild( antispamInput );
2337	1558	}
2338	1559
2339		- // Add a unique ID, used for duplicate checks.
2340		- const uniqueIDInput = document.createElement( 'input' );
2341		- uniqueIDInput.type = 'hidden';
2342		- uniqueIDInput.name = 'unique_id';
2343		- uniqueIDInput.value = getUniqueKey();
2344		- object.append( uniqueIDInput );
2345		-
2346		- if ( classList.includes( 'frm_ajax_submit' ) ) {
2347		- const fileInputs = object.querySelectorAll( 'input[type="file"]' );
2348		- hasFileFields = Array.from( fileInputs ).filter( input => !! input.value ).length;
	1560	+ if ( classList.indexOf( 'frm_ajax_submit' ) > -1 ) {
	1561	+ hasFileFields = jQuery( object ).find( 'input[type="file"]' ).filter( function() {
	1562	+ return !! this.value;
	1563	+ }).length;
2349	1564	if ( hasFileFields < 1 ) {
2350		- const actionInput = object.querySelector( 'input[name="frm_action"]' );
2351		- const action = actionInput ? actionInput.value : '';
	1565	+ action = jQuery( object ).find( 'input[name="frm_action"]' ).val();
2352	1566	frmFrontForm.checkFormErrors( object, action );
2353	1567	} else {
2354	1568	object.submit();
2355	1569	}
		@@ -2362,11 +1576,10 @@
2362	1576	* @param {HTMLElement|Object} object Form object. This might be a jQuery object.
2363	1577	*
2364	1578	* @return {Array} List of errors.
2365	1579	*/
2366		- validateFormSubmit( object ) {
2367		- const form = object instanceof jQuery ? object.get( 0 ) : object;
2368		- if ( typeof tinyMCE !== 'undefined' && form?.querySelector( '.wp-editor-wrap' ) ) {
	1580	+ validateFormSubmit: function( object ) {
	1581	+ if ( typeof tinyMCE !== 'undefined' && jQuery( object ).find( '.wp-editor-wrap' ).length ) {
2369	1582	tinyMCE.triggerSave();
2370	1583	}
2371	1584
2372	1585	jsErrors = [];
		@@ -2381,23 +1594,16 @@
2381	1594
2382	1595	return jsErrors;
2383	1596	},
2384	1597
2385		- /**
2386		- * @param {HTMLElement|Object} object Form object. This might be a jQuery object.
2387		- * @return {Array} List of errors.
2388		- */
2389		- getAjaxFormErrors( object ) {
2390		- let customErrors;
2391		- let key;
2392		- const form = object instanceof jQuery ? object.get( 0 ) : object;
	1598	+ getAjaxFormErrors: function( object ) {
	1599	+ let customErrors, key;
2393	1600
2394	1601	jsErrors = validateForm( object );
2395	1602	if ( typeof frmThemeOverride_jsErrors === 'function' ) { // eslint-disable-line camelcase
2396		- const actionInput = form ? form.querySelector( 'input[name="frm_action"]' ) : null;
2397		- const action = actionInput ? actionInput.value : '';
	1603	+ action = jQuery( object ).find( 'input[name="frm_action"]' ).val();
2398	1604	customErrors = frmThemeOverride_jsErrors( action, object );
2399		- if ( Object.keys( customErrors ).length ) {
	1605	+ if ( Object.keys( customErrors ).length ) {
2400	1606	for ( key in customErrors ) {
2401	1607	jsErrors[ key ] = customErrors[ key ];
2402	1608	}
2403	1609	}
		@@ -2402,30 +1608,20 @@
2402	1608	}
2403	1609	}
2404	1610	}
2405	1611
2406		- triggerCustomEvent( document, 'frm_get_ajax_form_errors', {
2407		- formEl: object,
2408		- errors: jsErrors
2409		- } );
2410		-
2411	1612	return jsErrors;
2412	1613	},
2413	1614
2414		- /**
2415		- * @param {HTMLElement|Object} object Form object. This might be a jQuery object.
2416		- * @return {void}
2417		- */
2418		- addAjaxFormErrors( object ) {
2419		- let key;
2420		- const form = object instanceof jQuery ? object.get( 0 ) : object;
	1615	+ addAjaxFormErrors: function( object ) {
	1616	+ let key, $fieldCont;
2421	1617	removeAllErrors();
2422	1618
2423	1619	for ( key in jsErrors ) {
2424		- const fieldCont = form ? form.querySelector( `#frm_field_${ key }_container` ) : null;
	1620	+ $fieldCont = jQuery( object ).find( '#frm_field_' + key + '_container' );
2425	1621
2426		- if ( fieldCont ) {
2427		- addFieldError( fieldCont, key, jsErrors );
	1622	+ if ( $fieldCont.length ) {
	1623	+ addFieldError( $fieldCont, key, jsErrors );
2428	1624	} else {
2429	1625	// we are unable to show the error, so remove it
2430	1626	delete jsErrors[ key ];
2431	1627	}
		@@ -2434,33 +1630,39 @@
2434	1630	scrollToFirstField( object );
2435	1631	checkForErrorsAndMaybeSetFocus();
2436	1632	},
2437	1633
2438		- checkFormErrors: getFormErrors,
2439		- checkRequiredField,
2440		- showSubmitLoading,
2441		- removeSubmitLoading,
	1634	+ checkFormErrors: function( object, action ) {
	1635	+ getFormErrors( object, action );
	1636	+ },
2442	1637
2443		- scrollToID( id ) {
	1638	+ checkRequiredField: function( field, errors ) {
	1639	+ return checkRequiredField( field, errors );
	1640	+ },
	1641	+
	1642	+ showSubmitLoading: function( $object ) {
	1643	+ showSubmitLoading( $object );
	1644	+ },
	1645	+
	1646	+ removeSubmitLoading: function( $object, enable, processesRunning ) {
	1647	+ removeSubmitLoading( $object, enable, processesRunning );
	1648	+ },
	1649	+
	1650	+ scrollToID: function( id ) {
2444	1651	const object = jQuery( document.getElementById( id ) );
2445	1652	frmFrontForm.scrollMsg( object, false );
2446	1653	},
2447	1654
2448		- scrollMsg( id, object, animate ) {
2449		- let newPos;
2450		- let screenTop;
2451		- let screenBottom;
2452		- let scrollObj = '';
2453		-
2454		- if ( object === undefined ) {
2455		- scrollObj = jQuery( document.getElementById( `frm_form_${ id }_container` ) );
	1655	+ scrollMsg: function( id, object, animate ) {
	1656	+ let newPos, m, b, screenTop, screenBottom,
	1657	+ scrollObj = '';
	1658	+ if ( typeof object === 'undefined' ) {
	1659	+ scrollObj = jQuery( document.getElementById( 'frm_form_' + id + '_container' ) );
2456	1660	if ( scrollObj.length < 1 ) {
2457	1661	return;
2458	1662	}
2459	1663	} else if ( typeof id === 'string' ) {
2460		- const formEl = object instanceof jQuery ? object.get( 0 ) : object;
2461		- const fieldEl = formEl ? formEl.querySelector( `#frm_field_${ id }_container` ) : null;
2462		- scrollObj = fieldEl ? jQuery( fieldEl ) : jQuery();
	1664	+ scrollObj = jQuery( object ).find( '#frm_field_' + id + '_container' );
2463	1665	} else {
2464	1666	scrollObj = id;
2465	1667	}
2466	1668
		@@ -2465,17 +1667,17 @@
2465	1667	}
2466	1668
2467	1669	jQuery( scrollObj ).trigger( 'focus' );
2468	1670	newPos = scrollObj.offset().top;
2469		- if ( ! newPos || frm_js.offset === '-1' ) {
	1671	+ if ( ! newPos || frm_js.offset === '-1' ) { // eslint-disable-line camelcase
2470	1672	return;
2471	1673	}
2472		- newPos = newPos - frm_js.offset;
	1674	+ newPos = newPos - frm_js.offset; // eslint-disable-line camelcase
2473	1675
2474		- const docMarginTop = getComputedStyle( document.documentElement ).marginTop;
2475		- const bodyMarginTop = getComputedStyle( document.body ).marginTop;
2476		- if ( docMarginTop || bodyMarginTop ) {
2477		- newPos = newPos - parseInt( docMarginTop ) - parseInt( bodyMarginTop );
	1676	+ m = jQuery( 'html' ).css( 'margin-top' );
	1677	+ b = jQuery( 'body' ).css( 'margin-top' );
	1678	+ if ( m || b ) {
	1679	+ newPos = newPos - parseInt( m ) - parseInt( b );
2478	1680	}
2479	1681
2480	1682	if ( newPos && window.innerHeight ) {
2481	1683	screenTop = document.documentElement.scrollTop || document.body.scrollTop;
		@@ -2482,12 +1684,12 @@
2482	1684	screenBottom = screenTop + window.innerHeight;
2483	1685
2484	1686	if ( newPos > screenBottom || newPos < screenTop ) {
2485	1687	// Not in view
2486		- if ( animate === undefined ) {
2487		- document.documentElement.scrollTop = newPos;
	1688	+ if ( typeof animate === 'undefined' ) {
	1689	+ jQuery( window ).scrollTop( newPos );
2488	1690	} else {
2489		- animateScroll( screenTop, newPos, 500 );
	1691	+ jQuery( 'html,body' ).animate({ scrollTop: newPos }, 500 );
2490	1692	}
2491	1693	return false;
2492	1694	}
2493	1695	}
		@@ -2492,13 +1694,13 @@
2492	1694	}
2493	1695	}
2494	1696	},
2495	1697
2496		- fieldValueChanged( e ) {
	1698	+ fieldValueChanged: function( e ) {
2497	1699	/*jshint validthis:true */
2498	1700
2499	1701	const fieldId = frmFrontForm.getFieldId( this, false );
2500		- if ( ! fieldId ) {
	1702	+ if ( ! fieldId || typeof fieldId === 'undefined' ) {
2501	1703	return;
2502	1704	}
2503	1705
2504	1706	if ( e.frmTriggered && e.frmTriggered == fieldId ) {
		@@ -2504,9 +1706,9 @@
2504	1706	if ( e.frmTriggered && e.frmTriggered == fieldId ) {
2505	1707	return;
2506	1708	}
2507	1709
2508		- jQuery( document ).trigger( 'frmFieldChanged', [ this, fieldId, e ] );
	1710	+ jQuery( document ).trigger( 'frmFieldChanged', [ this, fieldId, e ]);
2509	1711
2510	1712	if ( e.selfTriggered !== true ) {
2511	1713	maybeValidateChange( this );
2512	1714	}
		@@ -2511,10 +1713,9 @@
2511	1713	maybeValidateChange( this );
2512	1714	}
2513	1715	},
2514	1716
2515		- escapeHtml( text ) {
2516		- console.warn( 'DEPRECATED: function frmFrontForm.escapeHtml in v6.17' );
	1717	+ escapeHtml: function( text ) {
2517	1718	return text
2518	1719	.replace( /&/g, '&amp;' )
2519	1720	.replace( /</g, '&lt;' )
2520	1721	.replace( />/g, '&gt;' )
		@@ -2521,9 +1722,17 @@
2521	1722	.replace( /"/g, '&quot;' )
2522	1723	.replace( /'/g, '&#039;' );
2523	1724	},
2524	1725
2525		- triggerCustomEvent,
	1726	+ invisible: function( classes ) {
	1727	+ jQuery( classes ).css( 'visibility', 'hidden' );
	1728	+ },
	1729	+
	1730	+ visible: function( classes ) {
	1731	+ jQuery( classes ).css( 'visibility', 'visible' );
	1732	+ },
	1733	+
	1734	+ triggerCustomEvent: triggerCustomEvent,
2526	1735	documentOn
2527	1736	};
2528	1737	}
2529	1738
		@@ -2530,61 +1739,24 @@
2530	1739	window.frmFrontForm = frmFrontFormJS();
2531	1740
2532	1741	jQuery( document ).ready( function() {
2533	1742	frmFrontForm.init();
2534		-} );
	1743	+});
2535	1744
2536	1745	function frmRecaptcha() {
2537	1746	frmCaptcha( '.frm-g-recaptcha' );
2538	1747	}
2539	1748
2540		-function frmHcaptcha() {
2541		- frmCaptcha( '.h-captcha' );
2542		-}
2543		-
2544	1749	function frmTurnstile() {
2545		- frmCaptcha( '.frm-cf-turnstile' );
	1750	+ frmCaptcha( '.cf-turnstile' );
2546	1751	}
2547	1752
2548	1753	function frmCaptcha( captchaSelector ) {
2549		- if ( '.h-captcha' === captchaSelector ) {
2550		- // hCaptcha is still rendered implicitly, so we only want to handle the label and exit early.
2551		- // Match the hcaptcha labels to the hcaptcha response fields.
2552		- const captchaLabels = document.querySelectorAll( 'label[for="h-captcha-response"]' );
2553		- if ( captchaLabels.length ) {
2554		- captchaLabels.forEach( label => {
2555		- const captchaResponse = label.closest( 'form' )?.querySelector( '[name="h-captcha-response"]' );
2556		- if ( captchaResponse ) {
2557		- label.htmlFor = captchaResponse.id;
2558		- }
2559		- } );
2560		- }
2561		- return;
2562		- }
2563		-
2564	1754	let c;
2565	1755	const captchas = document.querySelectorAll( captchaSelector );
2566		- const cl = captchas.length;
	1756	+ const cl = captchas.length;
2567	1757	for ( c = 0; c < cl; c++ ) {
2568		- const closestForm = captchas[ c ].closest( 'form' );
2569		- const formIsVisible = closestForm && closestForm.offsetParent !== null;
2570		- const captcha = captchas[ c ];
2571		- if ( ! formIsVisible ) {
2572		- // If the form is not visible, try again later in 400ms.
2573		- // This fixes issues where the form fades visible on page load.
2574		- // Or when the form is inside of a modal.
2575		- const interval = setInterval(
2576		- function() {
2577		- if ( closestForm && closestForm.offsetParent !== null ) {
2578		- frmFrontForm.renderCaptcha( captcha, captchaSelector );
2579		- clearInterval( interval );
2580		- }
2581		- },
2582		- 400
2583		- );
2584		- continue;
2585		- }
2586		- frmFrontForm.renderCaptcha( captcha, captchaSelector );
	1758	+ frmFrontForm.renderCaptcha( captchas[c], captchaSelector );
2587	1759	}
2588	1760	}
2589	1761
2590	1762	function getSelectedCaptcha( captchaSelector ) {
		@@ -2590,9 +1762,9 @@
2590	1762	function getSelectedCaptcha( captchaSelector ) {
2591	1763	if ( captchaSelector === '.frm-g-recaptcha' ) {
2592	1764	return grecaptcha;
2593	1765	}
2594		- if ( document.querySelector( '.frm-cf-turnstile' ) ) {
	1766	+ if ( document.querySelector( '.cf-turnstile' ) ) {
2595	1767	return turnstile;
2596	1768	}
2597	1769	return hcaptcha;
2598	1770	}