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

kill another window variable

Browse Source
This commit is contained in:
ansuz 2016-03-29 12:13:57 +02:00
parent e699073d45
commit 29e24f556c
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/_socket/main.js
View File

@ -232,8 +232,16 @@ define([
var rti = module.realtimeInput = realtimeInput.start(realtimeOptions); var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
// FIXME Spaghetti code. realtime-input needs access to this variable.. /*
var propogate = window.cryptpad_propogate = function () { It's incredibly important that you assign 'rti.onLocal'
It's used inside of realtimeInput to make sure that all changes
make it into chainpad.
It's being assigned this way because it can't be passed in, and
and can't be easily returned from realtime input without making
the code less extensible.
*/
var propogate = rti.onLocal = function () {
var shjson = JSON.stringify(Hyperjson.fromDOM(inner, isNotMagicLine)); var shjson = JSON.stringify(Hyperjson.fromDOM(inner, isNotMagicLine));
if (!rti.patchText(shjson)) { return; } if (!rti.patchText(shjson)) { return; }
rti.onEvent(shjson); rti.onEvent(shjson);

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

@ -224,8 +224,9 @@ define([
verbose(message); verbose(message);
allMessages.push(message); allMessages.push(message);
if (!initializing) { if (!initializing) {
// FIXME this is out of sync with the application logic if (toReturn.onLocal) {
window.cryptpad_propogate(); toReturn.onLocal();
}
} }
realtime.message(message); realtime.message(message);
}); });