diff --git a/www/_socket/main.js b/www/_socket/main.js index 73831ac71..c93eb82e0 100644 --- a/www/_socket/main.js +++ b/www/_socket/main.js @@ -189,7 +189,7 @@ define([ // reject patch if it results in invalid JSON transformFunction : JsonOT.validate, - websocketURL: Config.websocketURL, + websocketURL: Config.websocketURL+'_old', // username userName: userName, diff --git a/www/pad/main.js b/www/pad/main.js index 5d2b168d7..91b9d009c 100644 --- a/www/pad/main.js +++ b/www/pad/main.js @@ -1,3 +1,4 @@ +require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } }); define([ '/api/config?cb=' + Math.random().toString(16).substring(2), '/common/messages.js', @@ -9,14 +10,19 @@ define([ '/common/cursor.js', '/common/json-ot.js', '/common/TypingTests.js', + 'json.sortify', '/bower_components/diff-dom/diffDOM.js', '/bower_components/jquery/dist/jquery.min.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 ifrw = $('#pad-iframe')[0].contentWindow; var Ckeditor; // to be initialized later... var DiffDom = window.diffDOM; + + var stringify = function (obj) { + return JSONSortify(obj); + }; window.Toolbar = Toolbar; window.Hyperjson = Hyperjson; @@ -51,7 +57,7 @@ define([ }; var stringifyDOM = function (dom) { - return JSON.stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter)); + return stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter)); }; var andThen = function (Ckeditor) { @@ -249,7 +255,7 @@ define([ applyHjson(shjson); // Build a new stringified Chainpad hyperjson without metadata to compare with the one build from the dom - shjson = JSON.stringify(hjson); + shjson = stringify(hjson); var shjson2 = stringifyDOM(inner); if (shjson2 !== shjson) { @@ -309,7 +315,7 @@ define([ hjson[hjson.length] = {metadata: userList}; } // stringify the json and send it into chainpad - var shjson = JSON.stringify(hjson); + var shjson = stringify(hjson); if (!rti.patchText(shjson)) { return; }