jenkins-bot has submitted this change and it was merged.
Change subject: Update uses of Push/IconButtonWidget to ButtonWidget
......................................................................
Update uses of Push/IconButtonWidget to ButtonWidget
Separated this commit form Ie74d98283c2b2fdd2 as it is causing
master to fail.
Change-Id: If4f6ee6c13a70afdf5653d1e83d71bfbdc80f9c0
---
M demos/ve/demo.js
M modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js
M modules/ve/ui/ve.ui.Inspector.js
M modules/ve/ui/widgets/ve.ui.GroupButtonWidget.js
M modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
5 files changed, 17 insertions(+), 11 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/ve/demo.js b/demos/ve/demo.js
index 68dcd69b..af6f60c 100644
--- a/demos/ve/demo.js
+++ b/demos/ve/demo.js
@@ -22,14 +22,14 @@
endTextInputLabel = new OO.ui.InputLabelWidget(
{ 'label': '-', 'input': endTextInput }
),
- getRangeButton = new OO.ui.PushButtonWidget( { 'label': 'Get
range' } ),
+ getRangeButton = new OO.ui.ButtonWidget( { 'label': 'Get range'
} ),
getRangeChangeToggle = new OO.ui.ToggleButtonWidget( { 'label':
'Get range on change' } ),
- logRangeButton = new OO.ui.PushButtonWidget(
+ logRangeButton = new OO.ui.ButtonWidget(
{ 'label': 'Log to console', 'disabled': true }
),
- dumpModelButton = new OO.ui.PushButtonWidget( { 'label': 'Dump
model' } ),
+ dumpModelButton = new OO.ui.ButtonWidget( { 'label': 'Dump
model' } ),
dumpModelChangeToggle = new OO.ui.ToggleButtonWidget( {
'label': 'Dump model on change' } ),
- validateButton = new OO.ui.PushButtonWidget( { 'label':
'Validate view and model' } );
+ validateButton = new OO.ui.ButtonWidget( { 'label': 'Validate
view and model' } );
// Initialization
diff --git a/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js
b/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js
index 92061c4..9d6f8d0 100644
--- a/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js
+++ b/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js
@@ -197,7 +197,7 @@
* Handle the click event on the button groups. The value of the selection
will be inserted
* into the text
*
- * @param {OO.ui.PushButtonWidget} button The value attached to the clicked
button
+ * @param {OO.ui.ButtonWidget} button The value attached to the clicked button
*/
ve.ui.SpecialCharacterInspector.prototype.onSpecialCharAdd = function ( button
) {
var fragment = this.surface.getModel().getFragment( null, true ),
diff --git a/modules/ve/ui/ve.ui.Inspector.js b/modules/ve/ui/ve.ui.Inspector.js
index 626faee..779ec8e 100644
--- a/modules/ve/ui/ve.ui.Inspector.js
+++ b/modules/ve/ui/ve.ui.Inspector.js
@@ -109,12 +109,18 @@
// Initialization
this.frame.$content.addClass( 've-ui-inspector-content' );
this.$form = this.$( '<form>' );
- this.closeButton = new OO.ui.IconButtonWidget( {
- '$': this.$, 'icon': 'previous', 'title': ve.msg(
'visualeditor-inspector-close-tooltip' )
+ this.closeButton = new OO.ui.ButtonWidget( {
+ '$': this.$,
+ 'frameless': true,
+ 'icon': 'previous',
+ 'title': ve.msg( 'visualeditor-inspector-close-tooltip' )
} );
if ( this.constructor.static.removable ) {
- this.removeButton = new OO.ui.IconButtonWidget( {
- '$': this.$, 'icon': 'remove', 'title': ve.msg(
'visualeditor-inspector-remove-tooltip' )
+ this.removeButton = new OO.ui.ButtonWidget( {
+ '$': this.$,
+ 'frameless': true,
+ 'icon': 'remove',
+ 'title': ve.msg(
'visualeditor-inspector-remove-tooltip' )
} );
}
diff --git a/modules/ve/ui/widgets/ve.ui.GroupButtonWidget.js
b/modules/ve/ui/widgets/ve.ui.GroupButtonWidget.js
index 50fbbc8..56e738d 100644
--- a/modules/ve/ui/widgets/ve.ui.GroupButtonWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.GroupButtonWidget.js
@@ -30,7 +30,7 @@
this.buttons = {};
// Set up the buttons
for ( item in this.group ) {
- button = new OO.ui.PushButtonWidget( {
+ button = new OO.ui.ButtonWidget( {
'label': item,
} );
// store value
diff --git a/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
b/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
index d7a7606..4d5ef1e 100644
--- a/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
@@ -75,7 +75,7 @@
};
// Create a 'change language' Button:
- this.$button = new OO.ui.PushButtonWidget({
+ this.$button = new OO.ui.ButtonWidget({
'label': ve.msg(
'visualeditor-languageinspector-widget-changelang' ),
// Add 'href' so the button returns true on click and triggers
ULS
'href': '#',
--
To view, visit https://gerrit.wikimedia.org/r/108043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4f6ee6c13a70afdf5653d1e83d71bfbdc80f9c0
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Esanders <esand...@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
