Permalink
Browse files

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

…OODLE_22_STABLE
  • Loading branch information...
2 parents fefcb95 + f2c88f4 commit 6fc4e1becb6b5c0fb0ea4ca6d2411a03ec196369 @danpoltawski danpoltawski committed Jul 16, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 mod/quiz/module.js
  2. +2 −2 mod/quiz/renderer.php
  3. +1 −1 mod/quiz/version.php
View
@@ -271,7 +271,7 @@ M.mod_quiz.secure_window = {
}, '#secureclosebutton');
},
- close: function(url, delay) {
+ close: function(Y, url, delay) {
setTimeout(function() {
if (window.opener) {
window.opener.document.location.reload();
View
@@ -496,8 +496,8 @@ public function close_attempt_popup($url, $message = '') {
$output .= html_writer::tag('p', get_string('pleaseclose', 'quiz'));
$delay = 0;
}
- $this->page->requires->js_function_call('M.mod_quiz.secure_window.close',
- array($url, $delay));
+ $this->page->requires->js_init_call('M.mod_quiz.secure_window.close',
+ array($url, $delay), false, quiz_get_js_module());
$output .= $this->box_end();
$output .= $this->footer();
View
@@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();
-$module->version = 2011112901; // The current module version (Date: YYYYMMDDXX)
+$module->version = 2011112902; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2011112900; // Requires this Moodle version
$module->component = 'mod_quiz'; // Full name of the plugin (used for diagnostics)
$module->cron = 60;

0 comments on commit 6fc4e1b

Please sign in to comment.