jenkins-bot has submitted this change and it was merged.
Change subject: Allow pressing 'escape' from all pages of save dialog
......................................................................
Allow pressing 'escape' from all pages of save dialog
Bonus: Add 'Resume editing' button to review changes page
Change-Id: Ief200c8aa2e2c8363bf6c9be3544ec1c56e07ff4
---
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 5c7ce0f..1b98419 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -55,7 +55,7 @@
{
label: OO.ui.deferMsg(
'visualeditor-savedialog-label-resume-editing' ),
flags: [ 'safe', 'back' ],
- modes: [ 'save', 'conflict' ]
+ modes: [ 'save', 'review', 'conflict' ]
},
{
action: 'review',
@@ -149,14 +149,13 @@
*/
ve.ui.MWSaveDialog.prototype.swapPanel = function ( panel ) {
var currentEditSummaryWikitext,
+ size = 'medium',
dialog = this,
panelObj = dialog[ panel + 'Panel' ];
if ( ( [ 'save', 'review', 'conflict', 'nochanges' ].indexOf( panel ) )
=== -1 ) {
throw new Error( 'Unknown saveDialog panel: ' + panel );
}
-
- this.setSize( 'medium' );
// Update the window title
// The following messages can be used here:
@@ -168,6 +167,10 @@
// Reset save button if we disabled it for e.g. unrecoverable spam error
this.actions.setAbilities( { save: true } );
+
+ // On panels without inputs, ensure the dialog is focused so events
+ // are captured, e.g. 'Esc' to close
+ this.$content[ 0 ].focus();
switch ( panel ) {
case 'save':
@@ -183,7 +186,7 @@
.setMode( 'conflict' );
break;
case 'review':
- this.setSize( 'larger' );
+ size = 'larger';
currentEditSummaryWikitext =
this.editSummaryInput.getValue();
if ( this.lastEditSummaryWikitext === undefined ||
this.lastEditSummaryWikitext !== currentEditSummaryWikitext ) {
if ( this.editSummaryXhr ) {
@@ -224,7 +227,7 @@
// Show the target panel
this.panels.setItem( panelObj );
- this.updateSize();
+ this.setSize( size );
mw.hook( 've.saveDialog.stateChanged' ).fire();
--
To view, visit https://gerrit.wikimedia.org/r/239883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief200c8aa2e2c8363bf6c9be3544ec1c56e07ff4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
