Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -rd7ee5a64ebe331639238710b120e72083c781fa4 -r1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7
--- lams_tool_doku/web/pages/learning/galleryWalk.jsp (.../galleryWalk.jsp) (revision d7ee5a64ebe331639238710b120e72083c781fa4)
+++ lams_tool_doku/web/pages/learning/galleryWalk.jsp (.../galleryWalk.jsp) (revision 1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7)
@@ -29,6 +29,8 @@
});
});
+
+ <%@ include file="websocket.jsp"%>
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -re606aaebe2ef85c40a4054ef76abf62c94d224a4 -r1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7
--- lams_tool_doku/web/pages/learning/learning.jsp (.../learning.jsp) (revision e606aaebe2ef85c40a4054ef76abf62c94d224a4)
+++ lams_tool_doku/web/pages/learning/learning.jsp (.../learning.jsp) (revision 1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7)
@@ -106,70 +106,6 @@
document.location.href='';
}
-
- //init the connection with server using server URL but with different protocol
- var dokuWebsocketInitTime = Date.now(),
- dokuWebsocket = new WebSocket(''.replace('http', 'ws')
- + 'learningWebsocket?toolContentID=' + ${sessionMap.toolContentID}),
- dokuWebsocketPingTimeout = null,
- dokuWebsocketPingFunc = null;
-
- dokuWebsocket.onclose = function(){
- // react only on abnormal close
- if (e.code === 1006 &&
- Date.now() - dokuWebsocketInitTime > 1000) {
- location.reload();
- }
- };
-
- dokuWebsocketPingFunc = function(skipPing){
- if (dokuWebsocket.readyState == dokuWebsocket.CLOSING
- || dokuWebsocket.readyState == dokuWebsocket.CLOSED){
- return;
- }
-
- // check and ping every 3 minutes
- dokuWebsocketPingTimeout = setTimeout(dokuWebsocketPingFunc, 3*60*1000);
- // initial set up does not send ping
- if (!skipPing) {
- dokuWebsocket.send("ping");
- }
- };
-
- // set up timer for the first time
- dokuWebsocketPingFunc(true);
-
- // run when the server pushes new reports and vote statistics
- dokuWebsocket.onmessage = function(e) {
- // reset ping timer
- clearTimeout(dokuWebsocketPingTimeout);
- dokuWebsocketPingFunc(true);
-
- // create JSON object
- var input = JSON.parse(e.data);
-
- // force page refresh, for example to go to Gallery Walk
- if (input.pageRefresh) {
- location.reload();
- return;
- }
-
- //monitor has added one minute to the total timeLimit time
- if (input.addTime) {
- //reload page in order to allow editing the pad again
- if (!$('#countdown').length) {
- location.reload();
- }
-
- var times = $("#countdown").countdown('getTimes'),
- secondsLeft = times[4]*3600 + times[5]*60 + times[6] + input.addTime*60;
- $('#countdown').countdown('option', "until", '+' + secondsLeft + 'S');
-
- return;
- }
- };
-
-
function displayCountdown() {
$.blockUI({
message: '',
@@ -207,6 +143,10 @@
});
}
+
+
+ <%@ include file="websocket.jsp"%>
+
Index: lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp
===================================================================
diff -u -rb5c36d2f8fb70869f2402ed3457a9513e2db871c -r1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7
--- lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp (.../waitForTimeLimitLaunch.jsp) (revision b5c36d2f8fb70869f2402ed3457a9513e2db871c)
+++ lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp (.../waitForTimeLimitLaunch.jsp) (revision 1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7)
@@ -6,63 +6,7 @@
<fmt:message key="label.learning.title" />
<%@ include file="/common/header.jsp"%>
-
+ <%@ include file="websocket.jsp"%>
Index: lams_tool_doku/web/pages/learning/websocket.jsp
===================================================================
diff -u
--- lams_tool_doku/web/pages/learning/websocket.jsp (revision 0)
+++ lams_tool_doku/web/pages/learning/websocket.jsp (revision 1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7)
@@ -0,0 +1,62 @@
+
\ No newline at end of file