infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Lock contenteditable until chain is done syncing.

Browse Source 
Don't bother patching the dom until the chain has synced
pull/1/head
ansuz 9 years ago
parent 4067e1caa8
commit c246adc57b
1 changed files with 52 additions and 65 deletions
Show Stats Download Patch File Download Diff File

117
www/vdom/main.js
Unescape Escape View File

@ -51,78 +51,58 @@ define([
var $textarea = $('#feedback'); var $textarea = $('#feedback');
var setEditable = function (bool) {
inner.setAttribute('contenteditable',
(typeof (bool) !== 'undefined'? bool : true));
};
// don't let the user edit until the pad is ready
setEditable(false);
var diffOptions = { var diffOptions = {
preDiffApply: function (info) { preDiffApply: function (info) {
var frame;
// no use trying to recover the cursor if it doesn't exist // no use trying to recover the cursor if it doesn't exist
if (!cursor.exists()) { return; } if (!cursor.exists()) { return; }
info.frame = frame = cursor.inNode(info.node); /* frame is either 0, 1, 2, or 3, depending on which
cursor frames were affected: none, first, last, or both
if (frame) { */
var debug = info.debug = { var frame = info.frame = cursor.inNode(info.node);
frame: frame,
action: info.diff.action, if (!frame) { return; }
cursorLength: cursor.getLength(),
node: info.node var debug = info.debug = {
}; frame: frame,
action: info.diff.action,
if (info.diff.action === 'removeTextElement') { cursorLength: cursor.getLength(),
// crap. there will be a text element removal. node: info.node
// that's bad news. };
if (frame === 1) { if (info.diff.oldValue) { debug.oldValue = info.diff.oldValue; }
// it's the starting element. if (info.diff.newValue) { debug.newValue = info.diff.newValue; }
if (typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') {
var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue);
} else if (frame === 2) { debug.commonStart = pushes.commonStart;
// it's the ending element. debug.commonEnd = pushes.commonEnd;
debug.insert = pushes.insert;
} else { debug.remove = pushes.remove;
// both were removed.
// there might not be much we can do if (frame & 1) {
// push cursor start if necessary
// the diff is going to run the following: if (pushes.commonStart < cursor.Range.start.offset) {
// info.node.parentNode.removeChild(node); cursor.Range.start.offset += pushes.delta;
} }
// avoid doing anything more?
// let the diff do its business.
return;
} }
if (frame & 2) {
if (info.diff.oldValue) { debug.oldValue = info.diff.oldValue; } // push cursor end if necessary
if (info.diff.newValue) { debug.newValue = info.diff.newValue; } if (pushes.commonStart < cursor.Range.end.offset) {
if (typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') { cursor.Range.end.offset += pushes.delta;
var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue);
debug.commonStart = pushes.commonStart;
debug.commonEnd = pushes.commonEnd;
debug.insert = pushes.insert;
debug.remove = pushes.remove;
if (frame & 1) {
// push cursor start if necessary
if (pushes.commonStart < cursor.Range.start.offset) {
cursor.Range.start.offset += pushes.delta;
}
}
if (frame & 2) {
// push cursor end if necessary
if (pushes.commonStart < cursor.Range.end.offset) {
cursor.Range.end.offset += pushes.delta;
}
} }
} }
console.log("###################################");
console.log(debug);
return;
} else {
console.log("###################################");
console.log(info.diff.action);
return;
} }
console.log("###################################");
console.log(debug);
}, },
postDiffApply: function (info) { postDiffApply: function (info) {
if (info.frame) { if (info.frame) {
@ -139,6 +119,8 @@ define([
} }
}; };
var initializing = true;
// apply patches, and try not to lose the cursor in the process! // apply patches, and try not to lose the cursor in the process!
var applyHjson = function (shjson) { var applyHjson = function (shjson) {
var userDocStateDom = Convert.hjson.to.dom(JSON.parse(shjson)); var userDocStateDom = Convert.hjson.to.dom(JSON.parse(shjson));
@ -149,11 +131,13 @@ define([
}; };
var onRemote = function (shjson) { var onRemote = function (shjson) {
// remember where the cursor is if (!initializing) {
cursor.update(); // remember where the cursor is
cursor.update();
// build a dom from HJSON, diff, and patch the editor // build a dom from HJSON, diff, and patch the editor
applyHjson(shjson); applyHjson(shjson);
}
}; };
var onInit = function (info) { /* TODO initialize the toolbar */ }; var onInit = function (info) { /* TODO initialize the toolbar */ };
@ -165,6 +149,9 @@ define([
onInit: onInit, onInit: onInit,
onReady: function (info) { onReady: function (info) {
console.log("Unlocking editor");
initializing = false;
setEditable(true);
applyHjson($textarea.val()); applyHjson($textarea.val());
$textarea.trigger('keyup'); $textarea.trigger('keyup');
}, },

Write Preview
Loading…
Cancel
Save