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

diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index e3a1ffc630cdfc56cbc370aeb973e4353ff0f3b7..083d9269ea7ea4f75086ce276cc252d4a374cbac 100644 (file)
--- 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 6788d8ef3536b68a96b6e18a9462565ec03b8493..3e1ed7526788e59dbde4cf1a6877d68615130b4e 100644 (file)
--- 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;