From a1f9b1017597ba39ce0ccc32e2fd538ae7592950 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 12 Apr 2016 10:02:11 +0200 Subject: [PATCH] remove offending line from chainpad entirely RTCHAINPAD-3 --- www/common/chainpad.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/www/common/chainpad.js b/www/common/chainpad.js index ba8a4d8ca..9d9dcc071 100644 --- a/www/common/chainpad.js +++ b/www/common/chainpad.js @@ -223,10 +223,6 @@ var transform = Patch.transform = function (origToTransform, transformBy, doc, t var toTransform = clone(origToTransform); var text = doc; 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--) { toTransform.operations[i] = Operation.transform(text, toTransform.operations[i],