Merge branch 'soon' into staging

2017-06-05 11:43:26 +02:00
parent 77d4ffba86 cc85e674f1
commit ec9a4dec5e
5 changed files with 552 additions and 6 deletions
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -197,8 +197,8 @@ define([

                /* add a history button */
                var histConfig = {
-                    onLocal: config.onLocal(),
-                    onRemote: config.onRemote(),
+                    onLocal: config.onLocal,
+                    onRemote: config.onRemote,
                    setHistory: setHistory,
                    applyVal: function (val) {
                        var remoteDoc = JSON.parse(val || '{}').content;