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

Shuffled around some assertions and logs

Browse Source
This commit is contained in:
Caleb James DeLisle
2016-03-25 14:14:19 +01:00
parent 420a7098a6
commit f62ec85a4c
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/_socket/main.js
View File

@@ -197,6 +197,11 @@ define([
// build a dom from HJSON, diff, and patch the editor
applyHjson(shjson);
//updateDebugTextarea(shjson);
var shjson2 = JSON.stringify(Convert.core.hyperjson.fromDOM(inner));
if (shjson2 !== shjson) {
throw new Error("change after conversion");
}
};
var onInit = function (info) {
@@ -260,9 +265,7 @@ define([
var rti = module.realtimeInput = window.rti = realtimeInput.start(realtimeOptions);
var propogate = window.cryptpad_propogate = function () {
var hjson = Convert.core.hyperjson.fromDOM(inner, isNotMagicLine);
var shjson = JSON.stringify(hjson);
var shjson = JSON.stringify(Convert.core.hyperjson.fromDOM(inner, isNotMagicLine));
if (!rti.propogate(shjson)) { return; }
rti.onEvent(shjson);
};