Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186913
Change subject: Use ActionFieldLayout in the template placeholder page
......................................................................
Use ActionFieldLayout in the template placeholder page
Instead of manually attaching a button to the input widget, use the
newly available ActionFieldLayout.
Change-Id: I3a39f476e6115f97f11ea49fac5bfcd93bd8f841
---
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
2 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/13/186913/1
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
index 214dcd1..4b843f0 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
@@ -18,6 +18,7 @@
* @cfg {jQuery} [$overlay] Overlay for dropdowns
*/
ve.ui.MWTemplatePlaceholderPage = function VeUiMWTemplatePlaceholderPage(
placeholder, name, config ) {
+ var addTemplateActionFieldLayout;
// Configuration initialization
config = ve.extendObject( {
scrollable: false
@@ -41,6 +42,7 @@
$: this.$,
label: ve.msg( 'visualeditor-dialog-transclusion-add-template'
),
flags: ['constructive'],
+ classes: [ 've-ui-mwTransclusionDialog-addButton' ],
disabled: true
} )
.connect( this, { click: 'onAddTemplate' } );
@@ -55,12 +57,18 @@
} )
.connect( this, { click: 'onRemoveButtonClick' } );
+ addTemplateActionFieldLayout = new OO.ui.ActionFieldLayout(
+ this.addTemplateInput,
+ this.addTemplateButton,
+ { $: this.$ }
+ );
+
this.addTemplateFieldset = new OO.ui.FieldsetLayout( {
$: this.$,
label: ve.msg( 'visualeditor-dialog-transclusion-placeholder' ),
icon: 'template',
classes: [ 've-ui-mwTransclusionDialog-addTemplateFieldset' ],
- $content: this.addTemplateInput.$element.add(
this.addTemplateButton.$element )
+ items: [ addTemplateActionFieldLayout ]
} );
// Initialization
diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
index cc8f313..6ba1e9b 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
@@ -13,7 +13,7 @@
margin-left: 0.5em;
}
-.ve-ui-mwTransclusionDialog-addTemplateFieldset > .ve-ui-mwTitleInputWidget {
+.ve-ui-mwTransclusionDialog-addTemplateFieldset .ve-ui-mwTitleInputWidget {
width: 20em;
}
@@ -35,6 +35,10 @@
top: 1.5em;
}
+.ve-ui-mwTransclusionDialog-addButton {
+ white-space: nowrap;
+}
+
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.oo-ui-fieldsetLayout > .oo-ui-labelElement-label,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.oo-ui-fieldsetLayout > .oo-ui-iconElement-icon,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.ve-ui-mwTransclusionDialog-removeButton,
--
To view, visit https://gerrit.wikimedia.org/r/186913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a39f476e6115f97f11ea49fac5bfcd93bd8f841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
