Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -rc7f95348c82e5e81ca8c3dbefd1408f31a6e3d56 -r6d721a0e00cff50aeec869b5399b5d2a49c54fa4
--- lams_tool_leader/web/pages/learning/leaderselection.jsp (.../leaderselection.jsp) (revision c7f95348c82e5e81ca8c3dbefd1408f31a6e3d56)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp (.../leaderselection.jsp) (revision 6d721a0e00cff50aeec869b5399b5d2a49c54fa4)
@@ -27,14 +27,18 @@
}
//init the connection with server using server URL but with different protocol
- var leaderWebsocket = new WebSocket(''.replace('http', 'ws')
+ var leaderWebsocketInitTime = Date.now(),
+ leaderWebsocket = new WebSocket(''.replace('http', 'ws')
+ 'learningWebsocket?toolSessionID=' + ${toolSessionID}),
leaderWebsocketPingTimeout = null,
leaderWebsocketPingFunc = null;
leaderWebsocketPingFunc = function(skipPing){
if (leaderWebsocket.readyState == leaderWebsocket.CLOSING
|| leaderWebsocket.readyState == leaderWebsocket.CLOSED){
+ if (Date.now() - leaderWebsocketInitTime < 1000) {
+ return;
+ }
location.reload();
}
@@ -50,7 +54,8 @@
leaderWebsocket.onclose = function(e){
// react only on abnormal close
- if (e.code === 1006) {
+ if (e.code === 1006 &&
+ Date.now() - leaderWebsocketInitTime > 1000) {
location.reload();
}
};