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

Merge "VisualDiff: Fetch original doc from Parsoid if fromEditedState"

Browse source
This commit is contained in:
jenkins-bot 2017-04-10 17:09:46 +00:00 committed by Gerrit Code Review
parent 77987b976d 939a1f4005
commit 4110bdfd26
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
modules/ve-mw/init/ve.init.mw.ArticleTarget.js
View file

@ -1176,17 +1176,36 @@ ve.init.mw.ArticleTarget.prototype.onSaveDialogReviewComplete = function ( wikit
* @return {jQuery.Promise|null} Promise resolving with a ve.dm.VisualDiff visual diff, or null if not known
*/
ve.init.mw.ArticleTarget.prototype.getVisualDiffPromise = function () {
var deferred;
var deferred, dmDoc,
target = this;
if ( this.getSurface().getMode() === 'source' ) {
return null;
}
deferred = $.Deferred();
dmDoc = this.getSurface().getModel().getDocument();
if ( !this.originalDmDoc ) {
// TODO: If switching from source - we need to fetch the original doc
// from the server.
this.originalDmDoc = this.createModelFromDom( this.doc, 'visual' );
if ( !this.fromEditedState ) {
this.originalDmDoc = this.createModelFromDom( this.doc, 'visual' );
} else {
mw.libs.ve.targetLoader.requestParsoidData(
this.pageName,
this.revid,
this.constructor.name
).then( function ( response ) {
var doc, data = response ? ( response.visualeditor || response.visualeditoredit ) : null;
if ( data && typeof data.content === 'string' ) {
doc = target.parseDocument( data.content, 'visual' );
target.originalDmDoc = target.createModelFromDom( doc, 'visual' );
deferred.resolve( new ve.dm.VisualDiff( target.originalDmDoc, dmDoc ) );
}
} );
}
}
if ( this.originalDmDoc ) {
deferred.resolve( new ve.dm.VisualDiff( this.originalDmDoc, dmDoc ) );
}
deferred.resolve( new ve.dm.VisualDiff( this.originalDmDoc, this.getSurface().getModel().getDocument() ) );
return deferred.promise();
};