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

Use canonical serializer for json serialization

Browse Source
This commit is contained in:
Caleb James DeLisle 2016-04-13 16:43:59 +02:00
parent 259772dd62
commit 698338b49a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -28,6 +28,7 @@
"reconnectingWebsocket": "", "reconnectingWebsocket": "",
"diff-dom": "https://github.com/fiduswriter/diffDOM.git#6fdb82c8a4f2096c07c129797a313fe13769e094", "diff-dom": "https://github.com/fiduswriter/diffDOM.git#6fdb82c8a4f2096c07c129797a313fe13769e094",
"marked": "~0.3.5", "marked": "~0.3.5",
"rangy": "rangy-release#~1.3.0" "rangy": "rangy-release#~1.3.0",
"json.sortify": "~2.1.0"
} }
} }

14
www/_socket/main.js
View File

@ -1,3 +1,4 @@
require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
define([ define([
'/api/config?cb=' + Math.random().toString(16).substring(2), '/api/config?cb=' + Math.random().toString(16).substring(2),
'/common/messages.js', '/common/messages.js',
@ -9,15 +10,20 @@ define([
'/common/cursor.js', '/common/cursor.js',
'/common/json-ot.js', '/common/json-ot.js',
'/common/TypingTests.js', '/common/TypingTests.js',
'json.sortify',
'/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) { ], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify) {
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...
var DiffDom = window.diffDOM; var DiffDom = window.diffDOM;
var stringify = function (obj) {
return JSONSortify(obj);
};
window.Hyperjson = Hyperjson; window.Hyperjson = Hyperjson;
var hjsonToDom = function (H) { var hjsonToDom = function (H) {
@ -165,7 +171,7 @@ define([
doc: inner, doc: inner,
// provide initialstate... // provide initialstate...
initialState: JSON.stringify(Hyperjson initialState: stringify(Hyperjson
.fromDOM(inner, isNotMagicLine)) || '{}', .fromDOM(inner, isNotMagicLine)) || '{}',
// really basic operational transform // really basic operational transform
@ -221,7 +227,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 = JSON.stringify(Hyperjson.fromDOM(inner)); var shjson2 = stringify(Hyperjson.fromDOM(inner));
if (shjson2 !== shjson) { if (shjson2 !== shjson) {
console.error("shjson2 !== shjson"); console.error("shjson2 !== shjson");
module.realtimeInput.patchText(shjson2); module.realtimeInput.patchText(shjson2);
@ -270,7 +276,7 @@ define([
the code less extensible. the code less extensible.
*/ */
var propogate = rti.onLocal = function () { var propogate = rti.onLocal = function () {
var shjson = JSON.stringify(Hyperjson.fromDOM(inner, isNotMagicLine, brFilter)); var shjson = stringify(Hyperjson.fromDOM(inner, isNotMagicLine, brFilter));
if (!rti.patchText(shjson)) { if (!rti.patchText(shjson)) {
return; return;
} }