From: Matthias Schmidt Date: Wed, 23 Dec 2020 14:15:59 +0000 (+0100) Subject: Add field attribute support for `EmailFormField` X-Git-Tag: 5.4.0_Alpha_1~507^2~17 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=08b00a30f2854be6c143875575728c49073f2e0a;p=GitHub%2FWoltLab%2FWCF.git Add field attribute support for `EmailFormField` --- diff --git a/com.woltlab.wcf/templates/__emailFormField.tpl b/com.woltlab.wcf/templates/__emailFormField.tpl index 938ece48ea..526c28ac17 100644 --- a/com.woltlab.wcf/templates/__emailFormField.tpl +++ b/com.woltlab.wcf/templates/__emailFormField.tpl @@ -12,6 +12,7 @@ *}{if $field->getInputMode() !== null} inputmode="{$field->getInputMode()}"{/if}{* *}{if $field->getPlaceholder() !== null} placeholder="{$field->getPlaceholder()}"{/if}{* *}{if $field->getDocument()->isAjax()} data-dialog-submit-on-enter="true"{/if}{* + *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* *}> {if $field->isI18n()} diff --git a/wcfsetup/install/files/acp/templates/__emailFormField.tpl b/wcfsetup/install/files/acp/templates/__emailFormField.tpl index 938ece48ea..526c28ac17 100644 --- a/wcfsetup/install/files/acp/templates/__emailFormField.tpl +++ b/wcfsetup/install/files/acp/templates/__emailFormField.tpl @@ -12,6 +12,7 @@ *}{if $field->getInputMode() !== null} inputmode="{$field->getInputMode()}"{/if}{* *}{if $field->getPlaceholder() !== null} placeholder="{$field->getPlaceholder()}"{/if}{* *}{if $field->getDocument()->isAjax()} data-dialog-submit-on-enter="true"{/if}{* + *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* *}> {if $field->isI18n()} diff --git a/wcfsetup/install/files/lib/system/form/builder/field/EmailFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/EmailFormField.class.php index 1ba672abaf..638e156a18 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/EmailFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/EmailFormField.class.php @@ -16,7 +16,10 @@ use wcf\util\UserUtil; * @package WoltLabSuite\Core\System\Form\Builder\Field * @since 5.2 */ -class EmailFormField extends AbstractFormField implements IAutoCompleteFormField, IAutoFocusFormField, ICssClassFormField, II18nFormField, IImmutableFormField, IInputModeFormField, IPatternFormField, IPlaceholderFormField { +class EmailFormField extends AbstractFormField implements IAttributeFormField, IAutoCompleteFormField, IAutoFocusFormField, ICssClassFormField, II18nFormField, IImmutableFormField, IInputModeFormField, IPatternFormField, IPlaceholderFormField { + use TAttributeFormField { + getReservedFieldAttributes as private defaultGetReservedFieldAttributes; + } use TAutoCompleteFormField; use TAutoFocusFormField; use TCssClassFormField; @@ -113,4 +116,17 @@ class EmailFormField extends AbstractFormField implements IAutoCompleteFormField )); } } + + /** + * @inheritDoc + * @since 5.4 + */ + protected static function getReservedFieldAttributes(): array { + return array_merge( + static::defaultGetReservedFieldAttributes(), + [ + 'maxlength', + ] + ); + } }