--- loncom/interface/lonhtmlcommon.pm 2009/08/13 16:12:51 1.182.4.5
+++ loncom/interface/lonhtmlcommon.pm 2009/08/23 12:59:18 1.182.4.8
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.182.4.5 2009/08/13 16:12:51 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.182.4.8 2009/08/23 12:59:18 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -978,8 +978,8 @@ sub Create_PrgWin {
#the whole function called through timeout is due to issues
#in mozilla Read BUG #2665 if you want to know the whole story
- &r_print($r,'");
+ "\nwindow.setTimeout(openpopwin,0)\n".
+ '// ]]>'."\n".
+ '');
$prog_state{'formname'}='popremain';
$prog_state{'inputname'}="remaining";
} elsif ($type eq 'inline') {
@@ -1025,13 +1025,13 @@ sub Create_PrgWin {
# update progress
sub Update_PrgWin {
my ($r,$prog_state,$displayString)=@_;
- &r_print($r,'');
$$prog_state{'laststart'}=&Time::HiRes::time();
}
@@ -1085,14 +1085,14 @@ sub Increment_PrgWin {
if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
$lasttime = '';
}
- &r_print($r,'');
$$prog_state{'laststart'}=&Time::HiRes::time();
}
@@ -1101,10 +1101,10 @@ sub Increment_PrgWin {
sub Close_PrgWin {
my ($r,$prog_state)=@_;
if ($$prog_state{'type'} eq 'popup') {
- &r_print($r,''."\n");
} elsif ($$prog_state{'type'} eq 'inline') {
&Update_PrgWin($r,$prog_state,&mt('Done'));
@@ -1287,7 +1287,7 @@ sub htmlareaselectactive {
}";
}
$output.="\nwindow.status='Activated Editfields';\n".
- '// ]]>'.
+ '// ]]>'."\n".
'
'.
&disablelink(@fields);
return $output;
@@ -1813,7 +1813,7 @@ sub topic_bar {
return '