web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
yflory
2019-11-25 11:03:13 +01:00
parent b73e195408 9a8604dfb4
commit 7895d93704
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
www/debug/inner.js
View File

@@ -439,7 +439,12 @@ define([
console.log(doc); console.log(doc);
}; };
config.onLocal = function () { }; var toRestore;
config.onLocal = function (a, restore) {
if (!toRestore || !restore) { return; }
cpNfInner.chainpad.contentUpdate(toRestore);
};
config.onInit = function (info) { config.onInit = function (info) {
Title = common.createTitle({}); Title = common.createTitle({});
@@ -459,10 +464,13 @@ define([
/* add a history button */ /* add a history button */
var histConfig = { var histConfig = {
onLocal: config.onLocal, onLocal: function () {
config.onLocal(null, true);
},
onRemote: config.onRemote, onRemote: config.onRemote,
setHistory: setHistory, setHistory: setHistory,
applyVal: function (val) { applyVal: function (val) {
toRestore = val;
displayDoc(JSON.parse(val) || {}); displayDoc(JSON.parse(val) || {});
}, },
$toolbar: $bar, $toolbar: $bar,