dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to patching with DiffDOM for testing :D

This commit is contained in:
Caleb James DeLisle 2016-02-11 16:10:44 +01:00
parent 2031191261
commit 86c4a69a97
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -25,6 +25,7 @@
"ckeditor": "~4.5.6",
"requirejs": "~2.1.15",
"modalBox": "~1.0.2",
"reconnectingWebsocket": ""
"reconnectingWebsocket": "",
"diff-dom": "~2.0.0"
}
}

2
www/common/realtime-input.js
View File

@ -231,7 +231,7 @@ define([
} else {
//verbose("Received remote message");
// obviously this is only going to get called if
onRemote && onRemote(realtime.getAuthDoc());
onRemote && onRemote(realtime.getUserDoc());
}
}
}

18
www/vdom/main.js
View File

@ -6,12 +6,15 @@ define([
'/common/convert.js',
'/common/toolbar.js',
'/common/cursor.js',
'/bower_components/diff-dom/diffDOM.js',
'/bower_components/jquery/dist/jquery.min.js',
'/customize/pad.js'
], function (Config, Messages, Crypto, realtimeInput, Convert, Toolbar, Cursor) {
var $ = window.jQuery;
var ifrw = $('#pad-iframe')[0].contentWindow;
window.Ckeditor = ifrw.CKEDITOR;
var DiffDom = window.diffDOM;
var userName = Crypto.rand64(8),
toolbar;
@ -59,16 +62,11 @@ define([
var applyHjson = function (shjson) {
console.log("Applying HJSON");
// before integrating external changes, check in your own
vdom1 = Convert.dom.to.vdom(inner);
// the authoritative document is hyperjson, parse it
var authDoc = JSON.parse(shjson);
// use the authdoc to construct a second vdom
var vdom2 = Convert.hjson.to.vdom(authDoc);
// diff it against your version
var patches = Vdom.diff(vdom1, vdom2);
// apply the resulting patches
Vdom.patch(inner, patches);
var userDocStateDom = Vdom.create(Convert.hjson.to.vdom(JSON.parse(shjson)));
userDocStateDom.setAttribute("contentEditable", "true"); // lol wtf
var patch = (new DiffDom()).diff(inner, userDocStateDom);
console.log(userDocStateDom.outerHTML);
(new DiffDom()).apply(inner, patch);
};
var onRemote = function (shjson) {