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/pad/main.js
+++ b/www/pad/main.js
@@ -500,8 +500,8 @@ define([

                /* add a history button */
                var histConfig = {
-                    onLocal: realtimeOptions.onLocal(),
-                    onRemote: realtimeOptions.onRemote(),
+                    onLocal: realtimeOptions.onLocal,
+                    onRemote: realtimeOptions.onRemote,
                    setHistory: setHistory,
                    applyVal: function (val) { applyHjson(val || '["BODY",{},[]]'); },
                    $toolbar: $bar