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

roll back to old transform function, except in pad

Browse Source
This commit is contained in:
ansuz 2017-11-06 17:18:10 +01:00
parent d10f752457
commit e07bb0f7b3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,9 +378,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,
patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
// cryptpad debug logging (default is 1) // cryptpad debug logging (default is 1)
// logLevel: 0, // logLevel: 0,

5
www/pad/inner.js
View File

@ -30,6 +30,7 @@ define([
'/api/config', '/api/config',
'/common/common-hash.js', '/common/common-hash.js',
'/common/common-util.js', '/common/common-util.js',
'/bower_components/chainpad-json-validator/json-ot.js',
'/bower_components/diff-dom/diffDOM.js', '/bower_components/diff-dom/diffDOM.js',
@ -48,7 +49,8 @@ define([
MediaTag, MediaTag,
ApiConfig, ApiConfig,
Hash, Hash,
Util) Util,
JsonOT)
{ {
var DiffDom = window.diffDOM; var DiffDom = window.diffDOM;
@ -553,6 +555,7 @@ define([
Framework.create({ Framework.create({
toolbarContainer: '#cke_1_toolbox', toolbarContainer: '#cke_1_toolbox',
contentContainer: '#cke_1_contents', contentContainer: '#cke_1_contents',
transformFunction: JsonOT.validate,
thumbnail: { thumbnail: {
getContainer: function () { return $('iframe').contents().find('html')[0]; }, getContainer: function () { return $('iframe').contents().find('html')[0]; },
filter: function (el, before) { filter: function (el, before) {