From: tjhunt <tjhunt>
Date: Wed, 5 Jul 2006 10:43:53 +0000 (+0000)
Subject: Bug 6019: Quiz timer does not submit the form when it reaches zero. Merged from MOODL... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=00aeaec820b8e5e26782ec748fdc436767d40935;p=moodle.git

Bug 6019: Quiz timer does not submit the form when it reaches zero. Merged from MOODLE_16_STABLE.
---

diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index e3a1ffc630..083d9269ea 100644
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -470,7 +470,7 @@
         ?>
         <script language="javascript" type="text/javascript">
         <!--
-            document.write("<form name=\"responseform\" method=\"post\" action=\"attempt.php\" autocomplete=\"off\">\n");
+            document.write("<form name=\"responseform\" id=\"responseform\" method=\"post\" action=\"attempt.php\" autocomplete=\"off\">\n");
         // -->
         </script>
         <noscript>
@@ -478,7 +478,7 @@
         </noscript>
         <?php
     } else {
-        echo "<form name=\"responseform\" method=\"post\" action=\"attempt.php\" autocomplete=\"off\">\n";
+        echo "<form name=\"responseform\" id=\"responseform\" method=\"post\" action=\"attempt.php\" autocomplete=\"off\">\n";
     }
 
     // Add a hidden field with the quiz id
@@ -490,11 +490,12 @@
         ?>
         <script language="javascript" type="text/javascript">
         function navigate(page) {
-            document.responseform.page.value=page;
-            if (document.responseform.onsubmit) {
-	            document.responseform.onsubmit();
+            var ourForm = document.forms['responseform']; 
+            ourForm.page.value=page;
+            if (ourForm.onsubmit) {
+	            ourForm.onsubmit();
 	        }
-            document.responseform.submit();
+            ourForm.submit();
         }
         </script>
         <?php
diff --git a/mod/quiz/timer.js b/mod/quiz/timer.js
index 6788d8ef35..3e1ed75267 100644
--- a/mod/quiz/timer.js
+++ b/mod/quiz/timer.js
@@ -13,11 +13,14 @@ function countdown_clock(theTimer) {
 	// @EC PF : time left according to client
 	quizTimerValue = Math.floor( (ec_quiz_finish - ec_now_epoch) /1000 );
 
-    if(quizTimerValue == 0) {
+    if(quizTimerValue <= 0) {
         clearTimeout(timeout_id);
-        document.forms['responseform'].timeup.value = 1;
-        document.forms['responseform'].onsubmit();
-        document.forms['responseform'].submit();
+        var ourForm = document.forms['responseform'];
+        ourForm.timeup.value = 1;
+        if (ourForm.onsubmit) { 
+	        ourForm.onsubmit();
+	    }
+        ourForm.submit();
     }
 
     now = quizTimerValue;