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

push browser fights into an array for inspection

Browse Source
This commit is contained in:
ansuz
2016-04-20 14:01:21 +02:00
parent b83fb7b823
commit e357549eda
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
www/p/main.js
View File

@@ -11,10 +11,11 @@ define([
'/common/json-ot.js', '/common/json-ot.js',
'/common/TypingTests.js', '/common/TypingTests.js',
'json.sortify', 'json.sortify',
'/common/TextPatcher.js',
'/bower_components/diff-dom/diffDOM.js', '/bower_components/diff-dom/diffDOM.js',
'/bower_components/jquery/dist/jquery.min.js', '/bower_components/jquery/dist/jquery.min.js',
'/customize/pad.js' '/customize/pad.js'
], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify) { ], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify, TextPatcher) {
var $ = window.jQuery; var $ = window.jQuery;
var ifrw = $('#pad-iframe')[0].contentWindow; var ifrw = $('#pad-iframe')[0].contentWindow;
var Ckeditor; // to be initialized later... var Ckeditor; // to be initialized later...
@@ -35,7 +36,9 @@ define([
var module = window.REALTIME_MODULE = { var module = window.REALTIME_MODULE = {
Hyperjson: Hyperjson, Hyperjson: Hyperjson,
Hyperscript: Hyperscript Hyperscript: Hyperscript,
logFights: true,
fights: [],
}; };
var isNotMagicLine = function (el) { var isNotMagicLine = function (el) {
@@ -92,8 +95,6 @@ define([
var inner = window.inner = documentBody; var inner = window.inner = documentBody;
var cursor = window.cursor = Cursor(inner); var cursor = window.cursor = Cursor(inner);
var setEditable = function (bool) { var setEditable = function (bool) {
// careful about putting attributes onto the DOM // careful about putting attributes onto the DOM
// they get put into the chain, and you can have trouble // they get put into the chain, and you can have trouble
@@ -240,8 +241,28 @@ define([
var shjson2 = stringifyDOM(inner); var shjson2 = stringifyDOM(inner);
if (shjson2 !== shjson) { if (shjson2 !== shjson) {
/* the client's browser made changes when pushing content
into the dom */
console.error("shjson2 !== shjson"); console.error("shjson2 !== shjson");
// push those changes back over the wire
module.realtimeInput.patchText(shjson2); module.realtimeInput.patchText(shjson2);
/* pushing back over the wire is necessary, but it can
result in a feedback loop, which we call a browser
fight */
if (module.logFights) {
// what changed?
var op = TextPatcher.diff(shjson, shjson2);
// log the changes
TextPatcher.log(shjson, op);
var sop = JSON.stringify(op);
if (module.fights.indexOf(sop) === -1) {
module.fights.push(sop);
console.log("Found a new type of browser disagreement");
}
}
} }
}; };