Merge pull request #14 from slub/fix-select-fields

Fix bug if using select fields and multiple forms on one page
slub · Dec 28, 2021 · b32fb13 · b32fb13
2 parents b6a1d41 + 666bd5c
commit b32fb13
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/Resources/Private/Partials/Forms/Textfield.html b/Resources/Private/Partials/Forms/Textfield.html
@@ -22,7 +22,7 @@
     <f:form.textfield id="slub-forms-field-{form.uid}-{fieldset.uid}-{field.uid}"
     class="{f:if(condition: fieldset.required, then: 'requiregroup-{form.uid}-{fieldset.uid}')} {f:if(condition: field.isSenderName, then: 'sender-name')} {f:if(condition: field.isSenderEmail, then: 'sender-email')} {field.shortname}"
     name="field[{fieldset.uid}][{field.uid}]"
-      type="{field.validation}"
+    type="{field.validation}"
     readonly="{sf:condition.isReadonlyField(field: '{field}')}"
     title="<f:translate key='validationerror_val_{field.validation}' />"
     value="<sf:form.fieldHasValue field='{field}' />"

diff --git a/Resources/Public/Js/FormValidation.js b/Resources/Public/Js/FormValidation.js
@@ -74,20 +74,21 @@ jQuery(document).ready(function() {
  * @return void
  */
 function hideAllForms() {
-	$('.slub-forms-form').addClass('hide'); // show all fields and fieldsets
-	$('.slub-forms-fieldset').find('input').prop('disabled', true);
-	$('.slub-forms-fieldset').find('textarea').prop('disabled', true);
+	$('.slub-forms-form').addClass('hide'); // hide all forms
+
+    disableAllHiddenForms();
 }
 
 /**
- * Hide all forms
+ * Disable all hidden forms
  *
  * @return void
  */
 function disableAllHiddenForms() {
 
 	$('.slub-forms-form.hide .slub-forms-fieldset').find('input').prop('disabled', true);
 	$('.slub-forms-form.hide .slub-forms-fieldset').find('textarea').prop('disabled', true);
+	$('.slub-forms-form.hide .slub-forms-fieldset').find('select').prop('disabled', true);
 
 }
 
@@ -105,11 +106,16 @@ function showForm(uid) {
 		return;
 	}
 
+    // initially hide all forms
 	hideAllForms();
 
-	$('#slub-forms-form-' + uid).removeClass('hide'); // hide current field
+    // show only form with given uid
+	$('#slub-forms-form-' + uid).removeClass('hide');
+
+    // enable all fields of this form
 	$('#slub-forms-form-' + uid).find('input').prop('disabled', false);
 	$('#slub-forms-form-' + uid).find('textarea').prop('disabled', false);
+	$('#slub-forms-form-' + uid).find('select').prop('disabled', false);
 
 	setCookie('sf_form', uid);
 
@@ -127,15 +133,15 @@ function showForm(uid) {
 }
 
 /**
- * Show a form
+ * Hides a form
  *
  * @param	integer	uid: uid of the element
  * @return	void
  */
 function hideForm(uid) {
 	$('#slub-forms-form-' + uid).addClass('hide'); // hide current field
-	$('#slub-forms-form-' + uid).find('input').prop('disabled', true);
-	$('#slub-forms-form-' + uid).find('textarea').prop('disabled', true);
+
+    disableAllHiddenForms();
 	setCookie('sf_form', '');
 }
 

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -27,7 +27,7 @@
 	'modify_tables' => '',
 	'clearCacheOnLoad' => 0,
 	'lockType' => '',
-	'version' => '1.0.4',
+	'version' => '1.0.5',
 	'constraints' => array(
 		'depends' => array(
 			'typo3' => '9.5.28-9.5.99',