mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
Trying to fix Safari bug (NaN).
This commit is contained in:
parent
6f4d8ece46
commit
b15f577dad
2 changed files with 6 additions and 2 deletions
|
@ -10,6 +10,7 @@
|
|||
var timesup = "<?php print_string("timesup","quiz");?>";
|
||||
var quizclose = <?php echo ($quiz->timeclose - time()) - $timerstartvalue; ?>; // in seconds
|
||||
var quizTimerValue = <? echo $timerstartvalue; ?>; // in seconds
|
||||
parseInt(quizTimerValue);
|
||||
// -->
|
||||
</script>
|
||||
<script language="javascript" type="text/javascript" src="timer.js"></script>
|
||||
|
|
|
@ -16,15 +16,18 @@ function countdown_clock() {
|
|||
|
||||
now = quizTimerValue;
|
||||
var hours = Math.floor( now / 3600 );
|
||||
parseInt(hours);
|
||||
now = now - (hours * 3600);
|
||||
var minutes = Math.floor(now / 60);
|
||||
parseInt(minutes);
|
||||
now = now - (minutes * 60);
|
||||
var seconds = now;
|
||||
parseInt(seconds);
|
||||
|
||||
var t = "" + hours;
|
||||
t += ((minutes < 10) ? ":0" : ":") + minutes;
|
||||
t += ((seconds < 10) ? ":0" : ":") + seconds;
|
||||
window.status = t;
|
||||
window.status = t.toString();
|
||||
|
||||
if(hours == 0 && minutes == 0 && seconds <= 15) {
|
||||
//go from fff0f0 to ffe0e0 to ffd0d0...ff2020, ff1010, ff0000 in 15 steps
|
||||
|
@ -32,7 +35,7 @@ function countdown_clock() {
|
|||
var col = 'ff' + hexascii.charAt(seconds) + '0' + hexascii.charAt(seconds) + 0;
|
||||
changecolor(col);
|
||||
}
|
||||
document.forms['clock'].time.value = t;
|
||||
document.forms['clock'].time.value = t.toString();
|
||||
timeout_id = setTimeout("countdown_clock()", 1000);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue