mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 00:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

sync with ether/etherpad-lite

Browse source
This commit is contained in:
ilmar 2018-05-02 11:08:57 +03:00
parent 64a2e5b7a3
commit c9863f81ad
20 changed files with 491 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/static/js/pad.js
View file

@ -206,10 +206,12 @@ function handshake()
socket.on('reconnect', function () {
pad.collabClient.setChannelState("CONNECTED");
pad.sendClientReady(true);
pad.sendClientReady(receivedClientVars);
});
socket.on('reconnecting', function() {
pad.collabClient.setStateIdle();
pad.collabClient.setIsPendingRevision(true);
pad.collabClient.setChannelState("RECONNECTING");
});
@ -217,6 +219,11 @@ function handshake()
pad.collabClient.setChannelState("DISCONNECTED", "reconnect_timeout");
});
socket.on('error', function(error) {
pad.collabClient.setStateIdle();
pad.collabClient.setIsPendingRevision(true);
});
var initalized = false;
socket.on('message', function(obj)
@ -831,7 +838,7 @@ var pad = {
$.ajax(
{
type: 'post',
url: '/ep/pad/connection-diagnostic-info',
url: 'ep/pad/connection-diagnostic-info',
data: {
diagnosticInfo: JSON.stringify(pad.diagnosticInfo)
},