mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Handle socketio errors properly

Browse source
This commit is contained in:
anugu-chegg 2018-02-05 22:37:49 +05:30 • committed by muxator
parent fb20c26c5f
commit 4265f4175e
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/static/js/collab_client.js
View file

@ -662,7 +662,8 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
getMissedChanges: getMissedChanges, getMissedChanges: getMissedChanges,
callWhenNotCommitting: callWhenNotCommitting, callWhenNotCommitting: callWhenNotCommitting,
addHistoricalAuthors: tellAceAboutHistoricalAuthors, addHistoricalAuthors: tellAceAboutHistoricalAuthors,
setChannelState: setChannelState setChannelState: setChannelState,
setStateIdle: setStateIdle
}; };
$(document).ready(setUpSocket); $(document).ready(setUpSocket);

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

@ -221,6 +221,11 @@ function handshake()
pad.collabClient.setChannelState("DISCONNECTED", "reconnect_timeout"); pad.collabClient.setChannelState("DISCONNECTED", "reconnect_timeout");
}); });
socket.on('error', function(error) {
socket.realConnected = false;
pad.collabClient.setStateIdle();
});
var initalized = false; var initalized = false;
socket.on('message', function(obj) socket.on('message', function(obj)