version 1.89, 2004/09/10 17:58:01
|
version 1.91, 2004/10/05 20:35:02
|
Line 525 sub javascript_nothing {
|
Line 525 sub javascript_nothing {
|
return $nothing; |
return $nothing; |
} |
} |
|
|
|
############################################## |
|
############################################## |
|
sub javascript_docopen { |
|
# safari does not understand document.open() and loads "text/html" |
|
my $nothing = "''"; |
|
my $user_browser; |
|
my $user_os; |
|
$user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'})); |
|
$user_os = $ENV{'browser.os'} if (exists($ENV{'browser.os'})); |
|
if (! defined($user_browser) || ! defined($user_os)) { |
|
(undef,$user_browser,undef,undef,undef,$user_os) = |
|
&Apache::loncommon::decode_user_agent(); |
|
} |
|
if ($user_browser eq 'safari' && $user_os =~ 'mac') { |
|
$nothing = "document.clear()"; |
|
} else { |
|
$nothing = "document.open('text/html','replace')"; |
|
} |
|
return $nothing; |
|
} |
|
|
|
|
############################################## |
############################################## |
############################################## |
############################################## |
Line 783 sub Increment_PrgWin {
|
Line 804 sub Increment_PrgWin {
|
my $sec = $time_est % 60; |
my $sec = $time_est % 60; |
# |
# |
my $str; |
my $str; |
if ($min == 1 && $sec > 1) { |
if ($min == 0 && $sec > 1) { |
$str = '[_2] seconds'; |
$str = '[_2] seconds'; |
|
} elsif ($min == 1 && $sec > 1) { |
|
$str = '1 minute [_2] seconds'; |
} elsif ($min == 1 && $sec < 2) { |
} elsif ($min == 1 && $sec < 2) { |
$str = '1 minute'; |
$str = '1 minute'; |
} elsif ($min < 10 && $sec > 1) { |
} elsif ($min < 10 && $sec > 1) { |