jenkins-bot has submitted this change and it was merged. Change subject: HTMLMultiSelectField: Use CheckboxMultiselectInputWidget ......................................................................
HTMLMultiSelectField: Use CheckboxMultiselectInputWidget Depends on I6f9fad0a462b43ac45c117cd3a3e11c36781cf11 in OOjs UI. Bug: T123935 Change-Id: I62322739b985cc2143b5094d23b3aa5dd1004c25 --- M includes/htmlform/HTMLMultiSelectField.php M resources/src/mediawiki/mediawiki.htmlform.ooui.css 2 files changed, 33 insertions(+), 19 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/htmlform/HTMLMultiSelectField.php b/includes/htmlform/HTMLMultiSelectField.php index 1aaa3e8..23125bd 100644 --- a/includes/htmlform/HTMLMultiSelectField.php +++ b/includes/htmlform/HTMLMultiSelectField.php @@ -65,21 +65,7 @@ protected function getOneCheckbox( $checked, $attribs, $label ) { if ( $this->mParent instanceof OOUIHTMLForm ) { - if ( $this->mOptionsLabelsNotFromMessage ) { - $label = new OOUI\HtmlSnippet( $label ); - } - return new OOUI\FieldLayout( - new OOUI\CheckboxInputWidget( [ - 'name' => "{$this->mName}[]", - 'selected' => $checked, - ] + OOUI\Element::configFromHtmlAttributes( - $attribs - ) ), - [ - 'label' => $label, - 'align' => 'inline', - ] - ); + throw new MWException( 'HTMLMultiSelectField#getOneCheckbox() is not supported' ); } else { $elementFunc = [ 'Html', $this->mOptionsLabelsNotFromMessage ? 'rawElement' : 'element' ]; $checkbox = @@ -100,6 +86,38 @@ } /** + * Get the OOUI version of this field. + * + * @since 1.28 + * @param string[] $value + * @return OOUI\CheckboxMultiselectInputWidget + */ + public function getInputOOUI( $value ) { + $attr = $this->getTooltipAndAccessKey(); + $attr['id'] = $this->mID; + $attr['name'] = "{$this->mName}[]"; + + $attr['value'] = $value; + $attr['options'] = $this->getOptionsOOUI(); + + if ( $this->mOptionsLabelsNotFromMessage ) { + foreach ( $attr['options'] as &$option ) { + $option['label'] = new OOUI\HtmlSnippet( $option['label'] ); + } + } + + $attr += OOUI\Element::configFromHtmlAttributes( + $this->getAttributes( [ 'disabled', 'tabindex' ] ) + ); + + if ( $this->mClass !== '' ) { + $attr['classes'] = [ $this->mClass ]; + } + + return new OOUI\CheckboxMultiselectInputWidget( $attr ); + } + + /** * @param WebRequest $request * * @return string diff --git a/resources/src/mediawiki/mediawiki.htmlform.ooui.css b/resources/src/mediawiki/mediawiki.htmlform.ooui.css index 8f0ad6b..47a662f 100644 --- a/resources/src/mediawiki/mediawiki.htmlform.ooui.css +++ b/resources/src/mediawiki/mediawiki.htmlform.ooui.css @@ -18,7 +18,3 @@ margin-right: 5%; width: 39%; } - -.oo-ui-fieldLayout .oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline { - margin-bottom: 0; -} -- To view, visit https://gerrit.wikimedia.org/r/291714 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62322739b985cc2143b5094d23b3aa5dd1004c25 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com> Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com> Gerrit-Reviewer: Edokter <er...@darcoury.nl> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits