Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r705c0f72b765849974bfa0d9f8b04797619e8da7 -r804dca72fa2ac638a9d3e2e66054d82688951c31
--- lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 705c0f72b765849974bfa0d9f8b04797619e8da7)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 804dca72fa2ac638a9d3e2e66054d82688951c31)
@@ -27,19 +27,7 @@
-
+
@@ -384,24 +372,19 @@
location.reload();
return;
}
-
+
if (input.clearTimer == true) {
// teacher stopped the timer, destroy it
$('#countdown').countdown('destroy').remove();
- } else if (input.secondsLeft){
+ } else if (typeof input.secondsLeft != 'undefined'){
// 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 if (secondsLeft){
- if (${isScratchingFinished}) {
- // teacher gave extra time, reload to enable scratching again
- location.reload();
- return;
- }
+ } else {
// initialise the timer
displayCountdown(secondsLeft);
}