Merge branch 'soon' into staging

8 years ago · 2851ceb95a
parent 2807ad9dc3 a995df25f6
commit 2851ceb95a
2 changed files with 3 additions and 3 deletions
--- a/www/code/main.js
+++ b/www/code/main.js
@ -157,8 +157,8 @@ define([
                readOnly: readOnly,
                crypto: Crypto.createEncryptor(secret.keys),
                setMyID: setMyID,
-                transformFunction: JsonOT.transform || JsonOT.validate,
+                network: Cryptpad.getNetwork(),
-                network: Cryptpad.getNetwork()
+                transformFunction: JsonOT.validate,
            };
            var canonicalize = function (t) { return t.replace(/\r\n/g, '\n'); };
--- a/www/pad/main.js
+++ b/www/pad/main.js
@ -404,7 +404,7 @@ define([
                crypto: Crypto.createEncryptor(secret.keys),
                // really basic operational transform
-                transformFunction : JsonOT.transform || JsonOT.validate,
+                transformFunction : JsonOT.validate,
                // cryptpad debug logging (default is 1)
                // logLevel: 0,