web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove offending line from chainpad entirely

Browse Source 
RTCHAINPAD-3
This commit is contained in:
ansuz
2016-04-12 10:02:11 +02:00
parent 4071a3aa25
commit a1f9b10175
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/chainpad.js
View File

@@ -223,10 +223,6 @@ var transform = Patch.transform = function (origToTransform, transformBy, doc, t
var toTransform = clone(origToTransform); var toTransform = clone(origToTransform);
var text = doc; var text = doc;
for (var i = toTransform.operations.length-1; i >= 0; i--) { for (var i = toTransform.operations.length-1; i >= 0; i--) {
/* 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--) { for (var j = transformBy.operations.length-1; j >= 0; j--) {
toTransform.operations[i] = Operation.transform(text, toTransform.operations[i] = Operation.transform(text,
toTransform.operations[i], toTransform.operations[i],