blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add debugging info to the textPatcher

Browse source 
* kill dead code
* add assertions
* better logging for insertions and removals
This commit is contained in:
ansuz 2016-03-30 14:38:10 +02:00
parent 523df40d09
commit aaf7c777cc
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
www/_socket/text-patcher.js
View file

@ -25,14 +25,37 @@ var applyChange = function(ctx, oldval, newval) {
commonEnd++;
}
var result;
/* throw some assertions in here before dropping patches into the realtime
*/
if (oldval.length !== commonStart + commonEnd) {
if (ctx.localChange) { ctx.localChange(true); }
ctx.remove(commonStart, oldval.length - commonStart - commonEnd);
result = oldval.length - commonStart - commonEnd;
ctx.remove(commonStart, result);
console.log('removal at position: %s, length: %s', commonStart, result);
console.log("remove: [" + oldval.slice(commonStart, commonStart + result ) + ']');
}
if (newval.length !== commonStart + commonEnd) {
if (ctx.localChange) { ctx.localChange(true); }
ctx.insert(commonStart, newval.slice(commonStart, newval.length - commonEnd));
//console.log("insert: " + newval.slice(commonStart, newval.length - commonEnd));
result = newval.slice(commonStart, newval.length - commonEnd);
ctx.insert(commonStart, result);
console.log("insert: [" + result + "]");
}
var userDoc;
try {
var userDoc = ctx.getUserDoc();
JSON.parse(userDoc);
} catch (err) {
console.error('[textPatcherParseErr]');
console.error(err);
window.REALTIME_MODULE.textPatcher_parseError = {
error: err,
userDoc: userDoc
};
}
};
@ -43,15 +66,9 @@ var create = function(config) {
// because nothing will equal this object
var content = {};
// FIXME this is only necessary because we need to be able to update the
// textarea. This is being deprecated, however. Instead
var replaceText = function(newText) {
content = newText;
};
// *** remote -> local changes
ctx.onPatch(function(pos, length) {
replaceText(ctx.getUserDoc());
content = ctx.getUserDoc()
});
// propogate()