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

Switch the transform function and also stop calling textPatcher without the metadata

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-10-09 17:07:26 +03:00
parent 36aee2d174
commit c8928a0811
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ define([
if (newContent2StrNoMeta !== newContentStrNoMeta) { if (newContent2StrNoMeta !== newContentStrNoMeta) {
console.error("shjson2 !== shjson"); console.error("shjson2 !== shjson");
textPatcher(newContent2StrNoMeta); onLocal();
/* pushing back over the wire is necessary, but it can /* pushing back over the wire is necessary, but it can
result in a feedback loop, which we call a browser result in a feedback loop, which we call a browser
@ -346,7 +346,7 @@ 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.transform,
// 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) {