diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js index ae0d3f3b6..d58710e1b 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -378,9 +378,7 @@ define([ }).nThen(function (waitFor) { cpNfInner = common.startRealtime({ // really basic operational transform - transformFunction: options.transformFunction || JsonOT.validate, - - patchTransformer: options.patchTransformer || JsonOT.patchTransformer, + transformFunction: options.transformFunction || JsonOT.transform, // cryptpad debug logging (default is 1) // logLevel: 0, diff --git a/www/pad/inner.js b/www/pad/inner.js index a8020e28e..2541f8ff0 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -30,6 +30,7 @@ define([ '/api/config', '/common/common-hash.js', '/common/common-util.js', + '/bower_components/chainpad-json-validator/json-ot.js', '/bower_components/diff-dom/diffDOM.js', @@ -48,7 +49,8 @@ define([ MediaTag, ApiConfig, Hash, - Util) + Util, + JsonOT) { var DiffDom = window.diffDOM; @@ -553,6 +555,7 @@ define([ Framework.create({ toolbarContainer: '#cke_1_toolbox', contentContainer: '#cke_1_contents', + transformFunction: JsonOT.validate, thumbnail: { getContainer: function () { return $('iframe').contents().find('html')[0]; }, filter: function (el, before) {