From f2c88f41fe41ae7c4a05abe778fad050ab3a2f57 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Fri, 13 Jul 2012 18:02:20 +0100 Subject: [PATCH] MDL-34257 quiz 'secure' window: does not close automatically. Conflicts: mod/quiz/version.php --- mod/quiz/module.js | 2 +- mod/quiz/renderer.php | 4 ++-- mod/quiz/version.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/quiz/module.js b/mod/quiz/module.js index 8e5cd00bd01..0492382fc2c 100644 --- a/mod/quiz/module.js +++ b/mod/quiz/module.js @@ -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(); diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php index d28055a88f6..020b5f72e88 100644 --- a/mod/quiz/renderer.php +++ b/mod/quiz/renderer.php @@ -496,8 +496,8 @@ class mod_quiz_renderer extends plugin_renderer_base { $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(); diff --git a/mod/quiz/version.php b/mod/quiz/version.php index b7ea97f08d8..395aede95c0 100644 --- a/mod/quiz/version.php +++ b/mod/quiz/version.php @@ -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;