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

detect falsey operations in OT and ignore them

Browse Source
This commit is contained in:
ansuz 2016-04-12 15:35:07 +02:00
parent 400f6efde1
commit 851ccfbdb6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/json-ot.js
View File

@ -4,6 +4,9 @@ define([
var ChainPad = window.ChainPad; var ChainPad = window.ChainPad;
var JsonOT = {}; var JsonOT = {};
/* FIXME
resultOp after transform0() might be null, in which case you should return null
because it is simply a transformation which yields a "do nothing" operation */
var validate = JsonOT.validate = function (text, toTransform, transformBy) { var validate = JsonOT.validate = function (text, toTransform, transformBy) {
var resultOp, text2, text3; var resultOp, text2, text3;
try { try {
@ -13,6 +16,11 @@ define([
// threeway merge (0, A, B) // threeway merge (0, A, B)
resultOp = ChainPad.Operation.transform0(text, toTransform, transformBy); resultOp = ChainPad.Operation.transform0(text, toTransform, transformBy);
/* if after operational transform we find that no op is necessary
return null to ignore this patch */
if (!resultOp) { return null; }
text2 = ChainPad.Operation.apply(transformBy, text); text2 = ChainPad.Operation.apply(transformBy, text);
text3 = ChainPad.Operation.apply(resultOp, text2); text3 = ChainPad.Operation.apply(resultOp, text2);
try { try {