infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

correct chainpad's transformation function 

addresses RTCHAINPAD-3

Pending further testing, this change will still need
to be corrected in https://github.com/xwiki-contrib/chainpad/
pull/1/head
ansuz 2016-04-12 09:44:08 +02:00
parent cd357a9136
commit 05108efdfa
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/chainpad.js
View File

@ -223,7 +223,10 @@ var transform = Patch.transform = function (origToTransform, transformBy, doc, t
toTransform = clone(origToTransform);
var text = doc;
for (var i = toTransform.operations.length-1; i >= 0; i--) {
text = Operation.apply(toTransform.operations[i], text);
/* this line caused diffs to be applied against the incorrect text
which resulted in bad merges that weren't noticeable until we
tried to patch json. */
//text = Operation.apply(toTransform.operations[i], text);
for (var j = transformBy.operations.length-1; j >= 0; j--) {
toTransform.operations[i] = Operation.transform(text,
toTransform.operations[i],