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

Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect

Browse Source
This commit is contained in:
ansuz
2016-02-11 13:15:57 +01:00
parent c22269e36e 2031191261
commit 653ba33b65
4 changed files with 74 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/chainpad.js
View File

@@ -372,7 +372,7 @@ var random = Patch.random = function (doc, opCount) {
var PARANOIA = module.exports.PARANOIA = false;
/* throw errors over non-compliant messages which would otherwise be treated as invalid */
var TESTING = module.exports.TESTING = true;
var TESTING = module.exports.TESTING = false;
var assert = module.exports.assert = function (expr) {
if (!expr) { throw new Error("Failed assertion"); }
@@ -1163,6 +1163,7 @@ module.exports.create = function (userName, authToken, channelId, initialState,
Common.assert(typeof(initialState) === 'string');
var realtime = ChainPad.create(userName, authToken, channelId, initialState, conf);
return {
Operation: Operation,
onPatch: enterChainPad(realtime, function (handler) {
Common.assert(typeof(handler) === 'function');
realtime.patchHandlers.push(handler);
@@ -1282,7 +1283,7 @@ var clone = Operation.clone = function (op) {
/**
* @param op the operation to apply.
* @param doc the content to apply the operation on
* @param doc the content to apply the operation on
*/
var apply = Operation.apply = function (op, doc)
{