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

xxx

Browse Source
This commit is contained in:
Caleb James DeLisle 2016-03-25 16:49:27 +01:00
parent 62eabbc7ae
commit 98c85cef8b
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/_socket/main.js
View File

@ -174,14 +174,11 @@ define([
// 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) {
//setEditable(false); //setEditable(false);
console.log(now());
var userDocStateDom = Convert.hjson.to.dom(JSON.parse(shjson)); var userDocStateDom = Convert.hjson.to.dom(JSON.parse(shjson));
userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf
console.log(now());
//assertStateMatches(); //assertStateMatches();
var patch = (DD).diff(inner, userDocStateDom); var patch = (DD).diff(inner, userDocStateDom);
(DD).apply(inner, patch); (DD).apply(inner, patch);
console.log(now());
// push back to the textarea so we get a userDocState // push back to the textarea so we get a userDocState
//setEditable(true); //setEditable(true);
}; };

2
www/_socket/realtime-input.js
View File

@ -172,7 +172,7 @@ define([
// wrap up the reconnecting websocket with our additional stack logic // wrap up the reconnecting websocket with our additional stack logic
var socket = makeWebsocket(websocketUrl); var socket = makeWebsocket(websocketUrl);
var allMessages = []; var allMessages = window.chainpad_allMessages = [];
var isErrorState = false; var isErrorState = false;
var initializing = true; var initializing = true;
var recoverableErrorCount = 0; var recoverableErrorCount = 0;

6
www/common/chainpad.js
View File

@ -1033,13 +1033,13 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr) {
// toApply.length-1 because we do not want to apply the new patch. // toApply.length-1 because we do not want to apply the new patch.
for (var i = 0; i < toApply.length-1; i++) { for (var i = 0; i < toApply.length-1; i++) {
if (Common.PARANOIA) {
Common.assert(Sha.hex_sha256(authDocAtTimeOfPatch) === toApply[i].content.parentHash);
}
if (typeof(toApply[i].content.inverseOf) === 'undefined') { if (typeof(toApply[i].content.inverseOf) === 'undefined') {
toApply[i].content.inverseOf = Patch.invert(toApply[i].content, authDocAtTimeOfPatch); toApply[i].content.inverseOf = Patch.invert(toApply[i].content, authDocAtTimeOfPatch);
toApply[i].content.inverseOf.inverseOf = toApply[i].content; toApply[i].content.inverseOf.inverseOf = toApply[i].content;
} }
if (Common.PARANOIA) {
Common.assert(Sha.hex_sha256(authDocAtTimeOfPatch) === toApply[i].content.parentHash);
}
authDocAtTimeOfPatch = Patch.apply(toApply[i].content, authDocAtTimeOfPatch); authDocAtTimeOfPatch = Patch.apply(toApply[i].content, authDocAtTimeOfPatch);
} }