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

Fix and then disable the new OT

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-10-23 14:22:33 +03:00
parent ce5d24a1d3
commit d7e9498143
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/sframe-app-framework.js
View File

@ -362,8 +362,11 @@ define([
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
cpNfInner = common.startRealtime({ cpNfInner = common.startRealtime({
// really basic operational transform // really basic operational transform
//transformFunction: options.transformFunction || JsonOT.validate, transformFunction: options.transformFunction || JsonOT.validate,
patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
// This one causes a big mess.
//patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
// cryptpad debug logging (default is 1) // cryptpad debug logging (default is 1)
// logLevel: 0, // logLevel: 0,
validateContent: options.validateContent || function (content) { validateContent: options.validateContent || function (content) {

2
www/common/sframe-chainpad-netflux-inner.js
View File

@ -38,6 +38,7 @@ define([
var userName = config.userName; var userName = config.userName;
var initialState = config.initialState; var initialState = config.initialState;
var transformFunction = config.transformFunction; var transformFunction = config.transformFunction;
var patchTransformer = config.patchTransformer;
var validateContent = config.validateContent; var validateContent = config.validateContent;
var avgSyncMilliseconds = config.avgSyncMilliseconds; var avgSyncMilliseconds = config.avgSyncMilliseconds;
var logLevel = typeof(config.logLevel) !== 'undefined'? config.logLevel : 1; var logLevel = typeof(config.logLevel) !== 'undefined'? config.logLevel : 1;
@ -50,6 +51,7 @@ define([
userName: userName, userName: userName,
initialState: initialState, initialState: initialState,
transformFunction: transformFunction, transformFunction: transformFunction,
patchTransformer: patchTransformer,
validateContent: validateContent, validateContent: validateContent,
avgSyncMilliseconds: avgSyncMilliseconds, avgSyncMilliseconds: avgSyncMilliseconds,
logLevel: logLevel logLevel: logLevel