jenkins-bot has submitted this change and it was merged.
Change subject: VESwitchConfirmDialog: Set pending on the correct button
......................................................................
VESwitchConfirmDialog: Set pending on the correct button
Button indices were the wrong way around; find the button by
name to avoid future problems.
Change-Id: I778ff11875539d38f5a8905c9ff472fd3bd6baae
---
M modules/ve-mw/ui/dialogs/ve.ui.MWVESwitchConfirmDialog.js
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWVESwitchConfirmDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWVESwitchConfirmDialog.js
index b94e5c1..6cf9a62 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWVESwitchConfirmDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWVESwitchConfirmDialog.js
@@ -78,14 +78,16 @@
ve.ui.MWVESwitchConfirmDialog.prototype.getActionProcess = function ( action )
{
if ( action === 'keep' ) {
return new OO.ui.Process( function () {
- this.getActions().setAbilities( { cancel: false,
discard: false } );
- this.getActions().get()[ 1 ].pushPending();
+ this.getActions()
+ .setAbilities( { cancel: false, discard: false
} )
+ .get( { actions: 'keep' } )[ 0 ].pushPending();
this.close( { action: 'keep' } );
}, this );
} else if ( action === 'discard' ) {
return new OO.ui.Process( function () {
- this.getActions().setAbilities( { cancel: false, keep:
false } );
- this.getActions().get()[ 2 ].pushPending();
+ this.getActions()
+ .setAbilities( { cancel: false, keep: false } )
+ .get( { actions: 'discard' } )[ 0
].pushPending();
this.close( { action: 'discard' } );
}, this );
} else if ( action === 'cancel' ) {
--
To view, visit https://gerrit.wikimedia.org/r/250722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I778ff11875539d38f5a8905c9ff472fd3bd6baae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
