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

more testing and crap

Browse Source
This commit is contained in:
Caleb James DeLisle
2016-03-25 12:45:51 +01:00
parent 4b35a145e3
commit 420a7098a6
5 changed files with 68 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/pad/realtime-wysiwyg.js
View File

@@ -327,10 +327,11 @@ console.log(new Error().stack);
error(false, 'realtime.getUserDoc() !== docText');
}
};
var now = function () { return new Date().getTime(); };
var userDocBeforePatch;
var incomingPatch = function () {
if (isErrorState || initializing) { return; }
console.log("before patch " + now());
userDocBeforePatch = userDocBeforePatch || getFixedDocText(doc, ifr.contentWindow);
if (PARANOIA && userDocBeforePatch !== getFixedDocText(doc, ifr.contentWindow)) {
error(false, "userDocBeforePatch !== getFixedDocText(doc, ifr.contentWindow)");
@@ -339,6 +340,7 @@ console.log(new Error().stack);
if (!op) { return; }
attempt(HTMLPatcher.applyOp)(
userDocBeforePatch, op, doc.body, Rangy, ifr.contentWindow);
console.log("after patch " + now());
};
realtime.onUserListChange(function (userList) {