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

This commit is contained in:
Dan Poltawski
2012-07-16 15:57:43 +08:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -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();
+2 -2
View File
@@ -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();
+1 -1
View File
@@ -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;