mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
Make the close_window function better. Merged from MOODLE_17_STABLE.
This commit is contained in:
parent
d84d379e97
commit
dfa924cc99
2 changed files with 14 additions and 8 deletions
|
@ -1047,6 +1047,7 @@ $string['periodending'] = 'Period ending ($a)';
|
|||
$string['personalprofile'] = 'Personal profile';
|
||||
$string['phone'] = 'Phone';
|
||||
$string['phpinfo'] = 'PHP info';
|
||||
$string['pleaseclose'] = 'Please close this window now.';
|
||||
$string['pluginsetup'] = 'Setting up plugin tables';
|
||||
$string['policyagree'] = 'You must agree to this policy to continue using this site. Do you agree?';
|
||||
$string['policyagreement'] = 'Site Policy Agreement';
|
||||
|
|
|
@ -690,15 +690,20 @@ function close_window_button($name='closewindow', $return=false) {
|
|||
* Try and close the current window immediately using Javascript
|
||||
*/
|
||||
function close_window($delay=0) {
|
||||
echo '<script language="JavaScript" type="text/javascript">'."\n";
|
||||
echo '<!--'."\n";
|
||||
if ($delay) {
|
||||
sleep($delay);
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
function close_this_window() {
|
||||
self.close();
|
||||
}
|
||||
echo 'self.close();'."\n";
|
||||
echo '-->'."\n";
|
||||
echo '</script>'."\n";
|
||||
exit;
|
||||
setTimeout("close_this_window()", <?php echo $delay * 1000 ?>);
|
||||
-->
|
||||
</script>
|
||||
<noscript><center>
|
||||
<?php print_string('pleaseclose') ?>
|
||||
</center></noscript>
|
||||
<?php
|
||||
die;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue