infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge pull request #30 from xwiki-labs/reconnect 

Ability to reconnect after a connection failure
pull/1/head
ansuz 2016-08-25 17:57:45 +02:00 committed by GitHub
parent 8297fbe954 c168ce2d1c
commit f40b798d88
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/toolbar.js
View File

@ -224,10 +224,11 @@ define([
return {
failed: function () {
connected = false;
userListElement.textContent = '';
userListElement.textContent = 'Disconnected';
lagElement.textContent = '';
},
reconnecting: function () {
reconnecting: function (userId) {
myUserName = userId;
connected = false;
userListElement.textContent = Messages.reconnecting;
lagElement.textContent = '';

12
www/pad/main.js
View File

@ -603,6 +603,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; }

11
www/text/main.js
View File

@ -74,10 +74,19 @@ define([
};
var onAbort = config.onAbort = function (info) {
$textarea.attr('disabled', true);
setEditable(false);
window.alert("Server Connection Lost");
};
var onConnectionChange = config.onConnectionChange = function (info) {
if (info.state) {
initializing = true;
} else {
setEditable(false);
window.alert("Server Connection Lost. Trying to reconnect...");
}
};
var rt = Realtime.start(config);
['cut', 'paste', 'change', 'keyup', 'keydown', 'select', 'textInput']