wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-12-23 11:32:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "MWSaveDialog: Restore focus to edit summary widget after resize"

Browse source
This commit is contained in:
jenkins-bot 2021-01-18 23:27:01 +00:00 committed by Gerrit Code Review
parent da10567e52 598cb943de
commit 59889add65
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
View file

@ -472,9 +472,10 @@ ve.ui.MWSaveDialog.prototype.swapPanel = function ( panel, noFocus ) {
* @param {Object} [options] * @param {Object} [options]
* @param {boolean} [options.wrap="warning"] Whether to wrap the message in a paragraph and if * @param {boolean} [options.wrap="warning"] Whether to wrap the message in a paragraph and if
* so, how. One of "warning", "error" or false. * so, how. One of "warning", "error" or false.
* @return {jQuery.Promise} Promise which resolves when the message has been shown, rejects if no new message shown.
*/ */
ve.ui.MWSaveDialog.prototype.showMessage = function ( name, message, options ) { ve.ui.MWSaveDialog.prototype.showMessage = function ( name, message, options ) {
var $message; var $message, promise;
if ( !this.messages[ name ] ) { if ( !this.messages[ name ] ) {
options = options || {}; options = options || {};
if ( options.wrap === undefined ) { if ( options.wrap === undefined ) {
@ -497,15 +498,18 @@ ve.ui.MWSaveDialog.prototype.showMessage = function ( name, message, options ) {
// FIXME: Use CSS transitions // FIXME: Use CSS transitions
// eslint-disable-next-line no-jquery/no-slide // eslint-disable-next-line no-jquery/no-slide
$message.slideDown( { promise = $message.slideDown( {
duration: 250, duration: 250,
progress: this.updateSize.bind( this ) progress: this.updateSize.bind( this )
} ); } ).promise();
this.swapPanel( 'save' ); this.swapPanel( 'save' );
this.messages[ name ] = $message; this.messages[ name ] = $message;
return promise;
} }
return ve.createDeferred().reject().promise();
}; };
/** /**
@ -617,7 +621,10 @@ ve.ui.MWSaveDialog.prototype.initialize = function () {
new ve.ui.Trigger( ve.ui.commandHelpRegistry.lookup( 'dialogConfirm' ).shortcuts[ 0 ] ).getMessage() new ve.ui.Trigger( ve.ui.commandHelpRegistry.lookup( 'dialogConfirm' ).shortcuts[ 0 ] ).getMessage()
), ),
{ wrap: false } { wrap: false }
); ).then( function () {
// Restore focus after potential window resize
dialog.editSummaryInput.focus();
} );
} ); } );
// Limit length, and display the remaining characters // Limit length, and display the remaining characters
this.editSummaryInput.$input.codePointLimit( this.editSummaryCodePointLimit ); this.editSummaryInput.$input.codePointLimit( this.editSummaryCodePointLimit );