Merge remote-tracking branch 'origin/sortify' into HEAD

utilize canonical stringify function

Conflicts:
	www/_socket/main.js

bower.json

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

www/_socket/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,15 +10,20 @@ 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.Hyperjson = Hyperjson;
 
     var hjsonToDom = function (H) {
@@ -52,7 +58,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) {
@@ -233,7 +239,6 @@ define([
                 applyHjson(shjson);
 
                 var shjson2 = stringifyDOM(inner);
-
                 if (shjson2 !== shjson) {
                     console.error("shjson2 !== shjson");
                     module.realtimeInput.patchText(shjson2);