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

Update to most recent chainpad

pull/1/head
Caleb James DeLisle 2016-04-22 18:17:00 +02:00
parent 2c158558f5
commit 5f16ad4a58
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
www/common/chainpad.js
View File

@ -224,10 +224,16 @@ var transform = Patch.transform = function (origToTransform, transformBy, doc, t
var text = doc;
for (var i = toTransform.operations.length-1; i >= 0; i--) {
for (var j = transformBy.operations.length-1; j >= 0; j--) {
toTransform.operations[i] = Operation.transform(text,
toTransform.operations[i],
transformBy.operations[j],
transformFunction);
try {
toTransform.operations[i] = Operation.transform(text,
toTransform.operations[i],
transformBy.operations[j],
transformFunction);
} catch (e) {
console.error("The pluggable transform function threw an error, " +
"failing operational transformation");
return create(Sha.hex_sha256(resultOfTransformBy));
}
if (!toTransform.operations[i]) {
break;
}
@ -370,6 +376,9 @@ var random = Patch.random = function (doc, opCount) {
var PARANOIA = module.exports.PARANOIA = true;
/* Good testing but slooooooooooow */
var VALIDATE_ENTIRE_CHAIN_EACH_MSG = module.exports.VALIDATE_ENTIRE_CHAIN_EACH_MSG = false;
/* throw errors over non-compliant messages which would otherwise be treated as invalid */
var TESTING = module.exports.TESTING = true;
@ -832,7 +841,9 @@ var check = ChainPad.check = function(realtime) {
Common.assert(uiDoc === realtime.userInterfaceContent);
}
/*var doc = realtime.authDoc;
if (!Common.VALIDATE_ENTIRE_CHAIN_EACH_MSG) { return; }
var doc = realtime.authDoc;
var patchMsg = realtime.best;
Common.assert(patchMsg.content.inverseOf.parentHash === realtime.uncommitted.parentHash);
var patches = [];
@ -844,7 +855,7 @@ var check = ChainPad.check = function(realtime) {
while ((patchMsg = patches.pop())) {
doc = Patch.apply(patchMsg.content, doc);
}
Common.assert(doc === realtime.authDoc);*/
Common.assert(doc === realtime.authDoc);
};
var doOperation = ChainPad.doOperation = function (realtime, op) {