From c8928a08112f4fadded43942dfaf0fff075cfbac Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Mon, 9 Oct 2017 17:07:26 +0300 Subject: [PATCH] Switch the transform function and also stop calling textPatcher without the metadata --- www/common/sframe-app-framework.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js index 986630487..9935cf1d8 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -157,7 +157,7 @@ define([ if (newContent2StrNoMeta !== newContentStrNoMeta) { console.error("shjson2 !== shjson"); - textPatcher(newContent2StrNoMeta); + onLocal(); /* pushing back over the wire is necessary, but it can result in a feedback loop, which we call a browser @@ -346,7 +346,7 @@ define([ }).nThen(function (waitFor) { cpNfInner = common.startRealtime({ // really basic operational transform - transformFunction: options.transformFunction || JsonOT.validate, + transformFunction: options.transformFunction || JsonOT.transform, // cryptpad debug logging (default is 1) // logLevel: 0, validateContent: options.validateContent || function (content) {