Merge branch 'master' of github.com:xwiki-labs/cryptpad

pull/1/head
ansuz 8 years ago
commit 5e57578fa9

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

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

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

Loading…
Cancel
Save