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

Merge "Bypass API call when wikitext is empty string"

Browse source
This commit is contained in:
jenkins-bot 2016-12-03 17:56:19 +00:00 committed by Gerrit Code Review
parent 75edb42236 f01d617c53
commit 6e503cdb0b
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
View file

@ -152,16 +152,23 @@ ve.dm.MWWikitextSurfaceFragment.prototype.convertToSource = function ( doc ) {
* @inheritdoc * @inheritdoc
*/ */
ve.dm.MWWikitextSurfaceFragment.prototype.convertFromSource = function ( source ) { ve.dm.MWWikitextSurfaceFragment.prototype.convertFromSource = function ( source ) {
var parsePromise = new mw.Api().post( { var parsePromise;
action: 'visualeditor', if ( !source ) {
paction: 'parsefragment', parsePromise = $.Deferred().resolve(
page: mw.config.get( 'wgRelevantPageName' ), this.getDocument().shallowCloneFromRange( new ve.Range( 0 ) )
wikitext: source ).promise();
} ).then( function ( response ) { } else {
return ve.dm.converter.getModelFromDom( parsePromise = new mw.Api().post( {
ve.createDocumentFromHtml( response.visualeditor.content ) action: 'visualeditor',
); paction: 'parsefragment',
} ); page: mw.config.get( 'wgRelevantPageName' ),
wikitext: source
} ).then( function ( response ) {
return ve.dm.converter.getModelFromDom(
ve.createDocumentFromHtml( response.visualeditor.content )
);
} );
}
// TODO: Show progress bar without breaking WindowAction // TODO: Show progress bar without breaking WindowAction
// ve.init.target.getSurface().createProgress( // ve.init.target.getSurface().createProgress(