Commit 2453531f authored by Petr Skoda's avatar Petr Skoda
Browse files

Merge branch 'MDL-26337' of git://github.com/timhunt/moodle

parents 3fa0670a 87113602
......@@ -1061,17 +1061,6 @@ function close_window(e) {
window.close();
}
/**
* Close the current browser window, forcing the window/tab that opened this
* popup to reload itself. */
function close_window_reloading_opener() {
if (window.opener) {
window.opener.location.reload(1);
close_window({});
// Intentionally, only try to close the window if there is some evidence we are in a popup.
}
}
/**
* Used in a couple of modules to hide navigation areas when using AJAX
*/
......
......@@ -823,13 +823,12 @@ function close_window($delay = 0, $reloadopener = false) {
}
if ($reloadopener) {
$function = 'close_window_reloading_opener';
} else {
$function = 'close_window';
// Trigger the reload immediately, even if the reload is after a delay.
$PAGE->requires->js_function_call('window.opener.location.reload', array(true));
}
echo '<p class="centerpara">' . get_string('windowclosing') . '</p>';
$OUTPUT->notification(get_string('windowclosing'), 'notifysuccess');
$PAGE->requires->js_function_call($function, null, false, $delay);
$PAGE->requires->js_function_call('close_window', array(new stdClass()), false, $delay);
echo $OUTPUT->footer();
exit;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment