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

Merge "Don't focus media dialog until ready process"

Browse source
This commit is contained in:
jenkins-bot 2017-08-24 17:18:54 +00:00 committed by Gerrit Code Review
parent 2abb9b1b2d b11b144ad6
commit f315c650f6
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
View file

@ -1126,8 +1126,6 @@ ve.ui.MWMediaDialog.prototype.getSetupProcess = function ( data ) {
return this.mediaUploadBooklet.initialize().then( function () {
dialog.actions.setAbilities( { upload: false, save: false, insert: false, apply: false } );
dialog.switchPanels( dialog.selectedNode ? 'edit' : 'search' );
if ( data.file ) {
dialog.searchTabs.setTabPanel( 'upload' );
dialog.mediaUploadBooklet.setFile( data.file );
@ -1298,13 +1296,8 @@ ve.ui.MWMediaDialog.prototype.resetCaption = function () {
ve.ui.MWMediaDialog.prototype.getReadyProcess = function ( data ) {
return ve.ui.MWMediaDialog.super.prototype.getReadyProcess.call( this, data )
.next( function () {
if ( this.currentPanel === 'search' ) {
// Focus the search input
this.search.getQuery().focus().select();
} else {
// Focus the caption surface
this.captionTarget.focus();
}
// #switchPanels triggers field focus, so do this in the ready process
this.switchPanels( this.selectedNode ? 'edit' : 'search' );
// Revalidate size
this.sizeWidget.validateDimensions();
}, this );