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

Follow-up Ifaf6a2607: Display correct message when switching

Browse source 
Use new mode, not old mode for choosing switch message.

Change-Id: I1ad0913b4a23fd6fbf5cdeb07d1a58ec72398d57
This commit is contained in:
Ed Sanders 2016-12-04 15:51:57 +00:00
parent 6e503cdb0b
commit aa7dba9bdb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -1537,8 +1537,7 @@ ve.init.mw.DesktopArticleTarget.prototype.switchToWikitextEditor = function ( di
return response;
} );
}
this.setDefaultMode( 'source' );
this.reloadSurface( dataPromise );
this.reloadSurface( 'source', dataPromise );
} else {
oldid = this.currentUri.query.oldid || $( 'input[name=parentRevId]' ).val();
target = this;
@ -1595,8 +1594,7 @@ ve.init.mw.DesktopArticleTarget.prototype.switchToVisualEditor = function () {
.then( function ( data ) {
if ( data && data.action === 'discard' ) {
target.section = null;
target.setDefaultMode( 'visual' );
target.reloadSurface();
target.reloadSurface( 'visual' );
}
windowManager.destroy();
} );
@ -1609,22 +1607,24 @@ ve.init.mw.DesktopArticleTarget.prototype.switchToVisualEditor = function () {
this.getDocToSave()
);
this.setDefaultMode( 'visual' );
this.reloadSurface( dataPromise );
this.reloadSurface( 'visual', dataPromise );
}
};
/**
* Reload the target surface in the new editor mode
*
* @param {string} newMode New mode
* @param {jQuery.Promise} [dataPromise] Data promise, if any
*/
ve.init.mw.DesktopArticleTarget.prototype.reloadSurface = function ( dataPromise ) {
ve.init.mw.DesktopArticleTarget.prototype.reloadSurface = function ( newMode, dataPromise ) {
var target = this;
this.setDefaultMode( newMode );
// Create progress - will be discarded when surface is destroyed.
this.getSurface().createProgress(
$.Deferred().promise(),
ve.msg( this.getSurface().getMode() === 'source' ? 'visualeditor-mweditmodesource-progress' : 'visualeditor-mweditmodeve-progress' ),
ve.msg( newMode === 'source' ? 'visualeditor-mweditmodesource-progress' : 'visualeditor-mweditmodeve-progress' ),
true /* non-cancellable */
);
this.activating = true;