← All changes | includes/Admin/Form/FrontEndScriptGenerator.php +40 -29 3.1.0 → V3.3.2 View file →

		@@ -31,22 +31,30 @@
31	31	private static function generateBfGlobalObjJS($contentIds = [])
32	32	{
33	33	$contentidArray = wp_json_encode($contentIds);
34	34	return ' if(!window.bf_globals){ window.bf_globals = {};}
35		- ' . $contentidArray . '.forEach(function(contentId){
36		- const form = document.getElementById(contentId);
37		- if(!form){
38		- delete window.bf_globals[contentId];
39		- return;
40		- }
41		- if(!window.bf_globals[contentId]){
42		- window.bf_globals[contentId] = {inits: {}, contentId: contentId};
43		- }else{
44		- window.bf_globals[contentId].inits = {};
45		- window.bf_globals[contentId].contentId = contentId;
	35	+ (function(){
	36	+ var bfSetupGlobals = function(){
	37	+ ' . $contentidArray . '.forEach(function(contentId){
	38	+ const form = document.getElementById(contentId);
	39	+ if(!form){
	40	+ delete window.bf_globals[contentId];
	41	+ return;
	42	+ }
	43	+ if(!window.bf_globals[contentId]){
	44	+ window.bf_globals[contentId] = {inits: {}, contentId: contentId};
	45	+ }else{
	46	+ if(!window.bf_globals[contentId].inits) window.bf_globals[contentId].inits = {};
	47	+ window.bf_globals[contentId].contentId = contentId;
	48	+ }
	49	+ });
	50	+ };
	51	+ if(document.readyState === "loading"){
	52	+ document.addEventListener("DOMContentLoaded", bfSetupGlobals, { once: true });
	53	+ } else {
	54	+ bfSetupGlobals();
46	55	}
47		-
48		- });';
	56	+ })();';
49	57	}
50	58
51	59	private static function isValidationNeeded($fldData)
52	60	{
		@@ -102,8 +110,10 @@
102	110	$this->appendJs($this->getScript(), $postId, $preview);
103	111	$this->appendJs($this->generateFieldConfigsJs($contentIds), $postId, $preview);
104	112	// init all js events and functions at last
105	113	$this->appendJs(self::getFileFromAssetsJs('bitform-init.min.js'), $postId, $preview);
	114	+ // picks up forms injected after load (AJAX, popups, lazy content)
	115	+ $this->appendJs(self::getFileFromAssetsJs('bitform-observer.min.js'), $postId, $preview);
106	116	if (defined('ELEMENTOR_PRO_VERSION')) {
107	117	$this->appendJs(self::getFileFromAssetsJs('bitform-elementor.min.js'), $postId, $preview);
108	118	}
109	119
		@@ -197,8 +207,12 @@
197	207	{
198	208	foreach ($this->_fields as $flds) {
199	209	foreach ($flds as $fld) {
200	210	$fldData = $fld['field'];
	211	+ // Corrupt/partial form JSON can produce a null field or one without typ.
	212	+ if (!is_object($fldData)) {
	213	+ continue;
	214	+ }
201	215	// for validation js files
202	216	if (self::isValidationNeeded($fldData)) {
203	217	$validation = $this->_validationJsFilesNeeded['validation'];
204	218	$this->addScriptInLoadedScriptsList($validation);
		@@ -208,13 +222,14 @@
208	222	$fileArr = $this->_validationJsFilesNeeded['requiredFldValidation'];
209	223	$this->addScriptInLoadedScriptsList($fileArr);
210	224	}
211	225	// for regex
212		- if (Helpers::property_exists_nested($fldData, 'valid->regexr')) {
213		- $patternFile = $this->_validationJsFilesNeeded['generateBackslashPattern'];
214		- $rgx = $this->_validationJsFilesNeeded['regexPatternValidation'];
215		- $this->addScriptInLoadedScriptsList($patternFile);
216		- $this->addScriptInLoadedScriptsList($rgx);
	226	+ // The RegEx scripts are registered by Pro; without it there is nothing to load.
	227	+ if (Helpers::property_exists_nested($fldData, 'valid->regexr')
	228	+ && !empty($this->_validationJsFilesNeeded['generateBackslashPattern'])
	229	+ && !empty($this->_validationJsFilesNeeded['regexPatternValidation'])) {
	230	+ $this->addScriptInLoadedScriptsList($this->_validationJsFilesNeeded['generateBackslashPattern']);
	231	+ $this->addScriptInLoadedScriptsList($this->_validationJsFilesNeeded['regexPatternValidation']);
217	232	}
218	233
219	234	$validationScriptFileMapping = ScriptFilePriorityManager::validationScriptFileMapping($fldData->typ);
220	235	if ($validationScriptFileMapping) {
		@@ -554,9 +569,15 @@
554	569
555	570	private function jsHiddenFieldScript()
556	571	{
557	572	$appConfig = get_option('bitform_app_config');
558		- if (Helpers::property_exists_nested($appConfig, 'cache_plugin', true)) {
	573	+ $cacheTokenEnabled = true;
	574	+ if (is_object($appConfig) && property_exists($appConfig, 'cache_plugin')) {
	575	+ $cacheTokenEnabled = (bool) $appConfig->cache_plugin;
	576	+ } elseif (is_array($appConfig) && array_key_exists('cache_plugin', $appConfig)) {
	577	+ $cacheTokenEnabled = (bool) $appConfig['cache_plugin'];
	578	+ }
	579	+ if ($cacheTokenEnabled) {
559	580	$fileArr = ScriptFilePriorityManager::frontendScriptFile()['hidden-token-field'];
560	581	$this->addScriptInLoadedScriptsList($fileArr);
561	582	return;
562	583	}
		@@ -570,16 +591,6 @@
570	591	$this->addScriptInLoadedScriptsList(['priority' => 303, 'filename' => 'initRecaptchaV3Fld.min.js']);
571	592	return;
572	593	}
573	594	}
574		- }
575		-
576		- public function dd($data, $exit = false)
577		- {
578		- echo '+++++++++++++';
579		- echo '<pre>';
580		- var_dump($data);
581		- echo '</pre>';
582		- echo '+++++++++++++';
583		- $exit ? exit : '';
584	595	}
585	596	}