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

Merge pull request #16 from xwiki-labs/beta

Browse Source 
Beta
This commit is contained in:
ansuz 2016-04-14 11:14:23 +02:00
commit 9a33e7cbf0
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
www/_socket/main.js
View File

@ -51,6 +51,16 @@ define([
return true; return true;
}; };
/* catch `type="_moz"` before it goes over the wire */
var brFilter = function (hj) {
if (hj[1].type === '_moz') { hj[1].type = undefined; }
return hj;
};
var stringifyDOM = function (dom) {
return stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
};
var andThen = function (Ckeditor) { var andThen = function (Ckeditor) {
$(window).on('hashchange', function() { $(window).on('hashchange', function() {
window.location.reload(); window.location.reload();
@ -82,6 +92,8 @@ 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
@ -171,8 +183,7 @@ define([
doc: inner, doc: inner,
// provide initialstate... // provide initialstate...
initialState: stringify(Hyperjson initialState: stringifyDOM(inner) || '{}',
.fromDOM(inner, isNotMagicLine)) || '{}',
// really basic operational transform // really basic operational transform
// reject patch if it results in invalid JSON // reject patch if it results in invalid JSON
@ -227,7 +238,7 @@ define([
// build a dom from HJSON, diff, and patch the editor // build a dom from HJSON, diff, and patch the editor
applyHjson(shjson); applyHjson(shjson);
var shjson2 = stringify(Hyperjson.fromDOM(inner)); var shjson2 = stringifyDOM(inner);
if (shjson2 !== shjson) { if (shjson2 !== shjson) {
console.error("shjson2 !== shjson"); console.error("shjson2 !== shjson");
module.realtimeInput.patchText(shjson2); module.realtimeInput.patchText(shjson2);
@ -261,11 +272,6 @@ define([
var rti = module.realtimeInput = realtimeInput.start(realtimeOptions); var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
/* catch `type="_moz"` before it goes over the wire */
var brFilter = function (hj) {
if (hj[1].type === '_moz') { hj[1].type = undefined; }
return hj;
};
/* It's incredibly important that you assign 'rti.onLocal' /* It's incredibly important that you assign 'rti.onLocal'
It's used inside of realtimeInput to make sure that all changes It's used inside of realtimeInput to make sure that all changes
@ -276,7 +282,7 @@ define([
the code less extensible. the code less extensible.
*/ */
var propogate = rti.onLocal = function () { var propogate = rti.onLocal = function () {
var shjson = stringify(Hyperjson.fromDOM(inner, isNotMagicLine, brFilter)); var shjson = stringifyDOM(inner);
if (!rti.patchText(shjson)) { if (!rti.patchText(shjson)) {
return; return;
} }

4
www/common/TextPatcher.js
View File

@ -23,8 +23,8 @@ var diff = function (oldval, newval) {
commonEnd++; commonEnd++;
} }
var toRemove; var toRemove = 0;
var toInsert; var toInsert = '';
/* throw some assertions in here before dropping patches into the realtime */ /* throw some assertions in here before dropping patches into the realtime */
if (oldval.length !== commonStart + commonEnd) { if (oldval.length !== commonStart + commonEnd) {