From 8881afbb1af31d083b0f02e6afa676e85fb659b9 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Fri, 1 Nov 2013 11:47:17 +0800 Subject: [PATCH] MDL-42663 mod_lesson: Move definitions to show_clock() Seems that the required data is not always set before timer.js is included. --- mod/lesson/timer.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mod/lesson/timer.js b/mod/lesson/timer.js index 6d32720fcd4..d21267d53ab 100644 --- a/mod/lesson/timer.js +++ b/mod/lesson/timer.js @@ -31,21 +31,6 @@ var javatime = javatimeDate.getTime(); javatime = Math.floor(javatime/1000); - if (typeof(clocksettings)!='undefined') { - if (clocksettings.starttime) { - starttime = parseInt(clocksettings.starttime); - } - if (clocksettings.servertime) { - servertime = parseInt(clocksettings.servertime); - } - if (clocksettings.testlength) { - testlength = parseInt(clocksettings.testlength); - } - } - - difference = javatime - servertime; - starttime = starttime + difference; - var dn = ""; var old = ""; @@ -64,6 +49,21 @@ function show_clock() { + if (typeof(clocksettings) != 'undefined') { + if (clocksettings.starttime) { + starttime = parseInt(clocksettings.starttime); + } + if (clocksettings.servertime) { + servertime = parseInt(clocksettings.servertime); + } + if (clocksettings.testlength) { + testlength = parseInt(clocksettings.testlength); + } + } + + difference = javatime - servertime; + starttime = starttime + difference; + //show clock in NS 4 if (document.layers) document.ClockPosNS.visibility="show";