Merge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle

moodle · Nov 4, 2013 · 0d0b93c · 0d0b93c
2 parents b804196 + 92bfad6
commit 0d0b93c
Showing 1 changed file with 15 additions and 15 deletions.
diff --git 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";