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

This commit is contained in:
ansuz
2016-08-25 17:59:37 +02:00
3 changed files with 25 additions and 3 deletions

View File

@@ -599,6 +599,18 @@ define([
Cryptpad.alert(Messages.disconnectAlert);
};
var onConnectionChange = realtimeOptions.onConnectionChange = function (info) {
setEditable(info.state);
toolbar.failed();
if (info.state) {
initializing = true;
toolbar.reconnecting(info.myId);
Cryptpad.findOKButton().click();
} else {
Cryptpad.alert(Messages.disconnectAlert);
}
};
var onLocal = realtimeOptions.onLocal = function () {
if (initializing) { return; }