Permalink
Browse files

Merge branch 'MDL-29360_21' of git://github.com/timhunt/moodle into M…

…OODLE_21_STABLE
  • Loading branch information...
2 parents 25aa44e + 4394f91 commit 3d2029f3d4ba657c2bb8b0771367d23285dc862a Sam Hemelryk committed Sep 18, 2011
Showing with 11 additions and 2 deletions.
  1. +1 −2 mod/quiz/comment.php
  2. +2 −0 mod/quiz/locallib.php
  3. +8 −0 mod/quiz/module.js
@@ -85,14 +85,13 @@
<fieldset class="felement fgroup">
<input id="id_submitbutton" type="submit" name="submit" value="<?php
print_string('save', 'quiz'); ?>"/>
- <input id="id_cancel" type="button" value="<?php
- print_string('cancel'); ?>" onclick="close_window()"/>
</fieldset>
</div>
</div>
</fieldset>
<?php
echo '</form>';
+$PAGE->requires->js_init_call('M.mod_quiz.init_comment_popup', null, false, quiz_get_js_module());
// End of the page.
echo $OUTPUT->footer();
@@ -1294,12 +1294,14 @@ function quiz_check_safe_browser() {
function quiz_get_js_module() {
global $PAGE;
+
return array(
'name' => 'mod_quiz',
'fullpath' => '/mod/quiz/module.js',
'requires' => array('base', 'dom', 'event-delegate', 'event-key',
'core_question_engine'),
'strings' => array(
+ array('cancel', 'moodle'),
array('timesup', 'quiz'),
array('functiondisabledbysecuremode', 'quiz'),
array('flagged', 'question'),
View
@@ -34,6 +34,14 @@ M.mod_quiz.init_review_form = function(Y) {
Y.on('submit', function(e) { e.halt(); }, '.questionflagsaveform');
};
+M.mod_quiz.init_comment_popup = function(Y) {
+ // Add a close button to the window.
+ var closebutton = Y.Node.create('<input type="button" />');
+ closebutton.set('value', M.util.get_string('cancel', 'moodle'));
+ Y.one('#id_submitbutton').ancestor().append(closebutton);
+ Y.on('click', function() { window.close() }, closebutton);
+}
+
// Code for updating the countdown timer that is used on timed quizzes.
M.mod_quiz.timer = {
// YUI object.

0 comments on commit 3d2029f

Please sign in to comment.