Index: lams_tool_assessment/web/pages/learning/learning.jsp =================================================================== diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569 --- lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision 0b1d534ce1915b907afff0171909f90226b31921) +++ lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision 8969536d397a74ec1c26188bdd4b207dc605c569) @@ -112,34 +112,36 @@ }); } - initWebsocket('assessmentTimeLimit${sessionMap.assessment.contentId}', - ''.replace('http', 'ws') - + 'learningWebsocket?toolContentID=${sessionMap.assessment.contentId}', - function (e) { - // read JSON object - var input = JSON.parse(e.data); + + initWebsocket('assessmentTimeLimit${sessionMap.assessment.contentId}', + ''.replace('http', 'ws') + 'learningWebsocket?toolContentID=${sessionMap.assessment.contentId}', + function (e) { + // read JSON object + var input = JSON.parse(e.data); + + if (input.clearTimer == true) { + // teacher stopped the timer, destroy it + $('#countdown').countdown('destroy').remove(); + } else { + // teacher updated the timer + var secondsLeft = +input.secondsLeft, + counterInitialised = $('#countdown').length > 0; + + if (counterInitialised) { + // just set the new time + $('#countdown').countdown('option', 'until', secondsLeft + 'S'); + } else { + // initialise the timer + displayCountdown(secondsLeft); + } + } + + // reset ping timer + websocketPing('assessmentTimeLimit${sessionMap.assessment.contentId}', true); + } + ); + - if (input.clearTimer == true) { - // teacher stopped the timer, destroy it - $('#countdown').countdown('destroy').remove(); - } else { - // teacher updated the timer - var secondsLeft = +input.secondsLeft, - counterInitialised = $('#countdown').length > 0; - - if (counterInitialised) { - // just set the new time - $('#countdown').countdown('option', 'until', secondsLeft + 'S'); - } else { - // initialise the timer - displayCountdown(secondsLeft); - } - } - - // reset ping timer - websocketPing('assessmentTimeLimit${sessionMap.assessment.contentId}', true); - }); - //autocomplete for VSA $('.ui-autocomplete-input').each(function(){ $(this).autocomplete({