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

Switch back to word-based diff

Browse source 
The char-based diff looked good in some pages, but yielded terrible results in
others. The word-based algo is more consistent overall.

Change-Id: I7f2d40315ad96df037c2d9a1d50739e3d21b6c81
This commit is contained in:
Gabriel Wicke 2012-06-04 00:02:49 +02:00
parent 4533c274ca
commit d2602c47a6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/ParserService.js
View file

@ -127,7 +127,7 @@ app.post(/\/_wikitext\/(.*)/, function(req, res){
});
/**
* Perform char-based diff on a line-based diff. The char-based algorithm is
* Perform word-based diff on a line-based diff. The word-based algorithm is
* practically unusable for inputs > 5k bytes, so we only perform it on the
* output of the more efficient line-based diff.
*/
@ -140,7 +140,7 @@ var refineDiff = function( diff ) {
added = d;
} else if ( d.removed ) {
if ( added ) {
var fineDiff = jsDiff.diffChars( d.value, added.value );
var fineDiff = jsDiff.diffWords( d.value, added.value );
out.push.apply( out, fineDiff );
added = null;
}
@ -185,7 +185,7 @@ app.get(/\/_roundtrip\/(.*)/, function(req, res){
var patch;
if ( src.length < 4000 ) {
// Use word-based diff for small articles
patch = jsDiff.convertChangesToXML( jsDiff.diffChars( out, src ) );
patch = jsDiff.convertChangesToXML( jsDiff.diffWords( out, src ) );
} else {
patch = jsDiff.convertChangesToXML( refineDiff( jsDiff.diffLines( out, src ) ) );
}