jenkins-bot has submitted this change and it was merged.
Change subject: Use ActionFieldLayout for language and auto-choose new lang on
add
......................................................................
Use ActionFieldLayout for language and auto-choose new lang on add
Change the current hacky layout to the proper ActionFieldLayout,
and also make sure that when the user adds a language, the new
language is selected.
Change-Id: I737a1dcfc08bd47829661daf3c08e2e480670842
---
M modules/ext.templateDataGenerator.ui.tdDialog.js
1 file changed, 28 insertions(+), 24 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index 00e8363..1f75e46 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -60,8 +60,7 @@
* @inheritDoc
*/
TemplateDataDialog.prototype.initialize = function () {
- var templateParamsFieldset, languageFieldset,
- addParamFieldlayout, languageFieldLayout,
+ var templateParamsFieldset, addParamFieldlayout,
languageActionFieldLayout,
paramOrderFieldset;
// Parent method
@@ -115,15 +114,15 @@
$: this.$,
label: mw.msg( 'templatedata-modal-button-add-language'
)
} );
- languageFieldLayout = new OO.ui.FieldLayout(
this.languageDropdownWidget, {
- $: this.$,
- align: 'left',
- label: mw.msg( 'templatedata-modal-title-language' )
- } );
- languageFieldset = new OO.ui.FieldsetLayout( {
- $: this.$,
- items: [ languageFieldLayout, this.languagePanelButton ]
- } );
+ languageActionFieldLayout = new OO.ui.ActionFieldLayout(
+ this.languageDropdownWidget,
+ this.languagePanelButton,
+ {
+ $: this.$,
+ align: 'left',
+ label: mw.msg(
'templatedata-modal-title-language' )
+ }
+ );
// ParamOrder
this.paramOrderWidget = new TemplateDataDragDropWidget( {
@@ -163,7 +162,7 @@
.addClass( 'tdg-templateDataDialog-listParamsPanel' )
.append(
this.paramListNoticeLabel.$element,
- languageFieldset.$element,
+ languageActionFieldLayout.$element,
this.templateDescriptionFieldset.$element,
paramOrderFieldset.$element,
templateParamsFieldset.$element
@@ -326,19 +325,24 @@
var languageButton,
newLanguage = data.code;
- if (
- newLanguage &&
- $.inArray( newLanguage, this.availableLanguages ) === -1
- ) {
- // Add new language
- this.availableLanguages.push( newLanguage );
- languageButton = new OO.ui.OptionWidget( {
- data: newLanguage,
- $: this.$,
- label: $.uls.data.getAutonym( newLanguage )
- } );
- this.languageDropdownWidget.getMenu().addItems( [
languageButton ] );
+ if ( newLanguage ) {
+ if ( $.inArray( newLanguage, this.availableLanguages )
=== -1 ) {
+ // Add new language
+ this.availableLanguages.push( newLanguage );
+ languageButton = new OO.ui.OptionWidget( {
+ data: newLanguage,
+ $: this.$,
+ label: $.uls.data.getAutonym(
newLanguage )
+ } );
+ this.languageDropdownWidget.getMenu().addItems(
[ languageButton ] );
+ }
+
+ // Select the new item
+ this.languageDropdownWidget.getMenu().chooseItem(
+
this.languageDropdownWidget.getMenu().getItemFromData( newLanguage )
+ );
}
+
// Go to the main panel
this.switchPanels( 'listParams' );
};
--
To view, visit https://gerrit.wikimedia.org/r/187459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I737a1dcfc08bd47829661daf3c08e2e480670842
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <mor...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
