Merge "Change mid-upload 'cancel' button to 'back'"

This commit is contained in:
jenkins-bot 2016-09-26 18:34:38 +00:00 committed by Gerrit Code Review
commit 720b97694e

View file

@ -86,10 +86,16 @@ ve.ui.MWMediaDialog.static.actions = [
flags: [ 'safe', 'back' ],
modes: [ 'info' ]
},
{
action: 'cancelupload',
label: OO.ui.deferMsg( 'visualeditor-dialog-media-goback' ),
flags: [ 'safe', 'back' ],
modes: [ 'upload-info' ]
},
{
label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
flags: [ 'safe', 'back' ],
modes: [ 'edit', 'insert', 'select', 'search', 'upload-upload', 'upload-info' ]
modes: [ 'edit', 'insert', 'select', 'search', 'upload-upload' ]
},
{
action: 'back',
@ -1371,6 +1377,13 @@ ve.ui.MWMediaDialog.prototype.getActionProcess = function ( action ) {
return this.mediaUploadBooklet.initialize();
};
break;
case 'cancelupload':
handler = function () {
this.searchTabs.setCard( 'upload' );
this.searchTabs.toggleMenu( true );
return this.mediaUploadBooklet.initialize();
};
break;
case 'upload':
return new OO.ui.Process( this.mediaUploadBooklet.uploadFile() );
case 'save':