public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated option parameters for socket.io to work with latest version

pull/3085/head
Stefan 2016-11-20 12:27:27 +01:00
parent 602fd4629a
commit 39a3bedb7b
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/static/js/pad.js
View File

@ -231,40 +231,27 @@ function handshake()
// Allow deployers to host Etherpad on a non-root path // Allow deployers to host Etherpad on a non-root path
'path': exports.baseURL + "socket.io", 'path': exports.baseURL + "socket.io",
'resource': resource, 'resource': resource,
'max reconnection attempts': 3, 'reconnectionAttempts': 5,
'sync disconnect on unload' : false 'reconnection' : true,
'reconnectionDelay' : 1000,
'reconnectionDelayMax' : 5000
}); });
var disconnectTimeout;
socket.once('connect', function () { socket.once('connect', function () {
sendClientReady(false); sendClientReady(false);
}); });
socket.on('reconnect', function () { socket.on('reconnect', function () {
//reconnect is before the timeout, lets stop the timeout
if(disconnectTimeout)
{
clearTimeout(disconnectTimeout);
}
pad.collabClient.setChannelState("CONNECTED"); pad.collabClient.setChannelState("CONNECTED");
pad.sendClientReady(true); pad.sendClientReady(true);
}); });
socket.on('disconnect', function (reason) { socket.on('reconnecting', function() {
if(reason == "booted"){ pad.collabClient.setChannelState("RECONNECTING");
pad.collabClient.setChannelState("DISCONNECTED"); });
} else {
function disconnectEvent() socket.on('reconnect_failed', function(error) {
{ pad.collabClient.setChannelState("DISCONNECTED", "reconnect_timeout");
pad.collabClient.setChannelState("DISCONNECTED", "reconnect_timeout");
}
pad.collabClient.setChannelState("RECONNECTING");
disconnectTimeout = setTimeout(disconnectEvent, 20000);
}
}); });
var initalized = false; var initalized = false;