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

don't rely on RealtimeSocket exporting textPatcher

Browse Source
This commit is contained in:
ansuz 2016-04-21 17:59:30 +02:00
parent 4f426651ad
commit 80fb5e1e21
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
www/p/main.js
View File

@ -259,7 +259,7 @@ define([
into the dom */ into the dom */
console.error("shjson2 !== shjson"); console.error("shjson2 !== shjson");
// push those changes back over the wire // push those changes back over the wire
module.realtimeInput.patchText(shjson2); module.patchText(shjson2);
/* pushing back over the wire is necessary, but it can /* pushing back over the wire is necessary, but it can
result in a feedback loop, which we call a browser result in a feedback loop, which we call a browser
@ -294,13 +294,17 @@ define([
}; };
var onReady = realtimeOptions.onReady = function (info) { var onReady = realtimeOptions.onReady = function (info) {
console.log("Unlocking editor");
initializing = false;
setEditable(true);
var shjson = info.realtime.getUserDoc(); var shjson = info.realtime.getUserDoc();
module.patchText = TextPatcher.create({
realtime: info.realtime,
logging: true,
});
applyHjson(shjson); applyHjson(shjson);
console.log("Unlocking editor");
setEditable(true);
initializing = false;
}; };
var onAbort = realtimeOptions.onAbort = function (info) { var onAbort = realtimeOptions.onAbort = function (info) {
@ -314,7 +318,7 @@ define([
var onLocal = realtimeOptions.onLocal = function () { var onLocal = realtimeOptions.onLocal = function () {
if (initializing) { return; } if (initializing) { return; }
var shjson = stringifyDOM(inner); var shjson = stringifyDOM(inner);
rti.patchText(shjson); module.patchText(shjson);
}; };
var rti = module.realtimeInput = realtimeInput.start(realtimeOptions); var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
@ -333,7 +337,7 @@ define([
var start = cursor.Range.start; var start = cursor.Range.start;
var test = TypingTest.testInput(inner, start.el, start.offset, onLocal); var test = TypingTest.testInput(inner, start.el, start.offset, onLocal);
// why twice? // why twice?
onLocale(); onLocal();
return test; return test;
}; };