[BACK]Return to lonhtmlcommon.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.16 and 1.19

version 1.16, 2003/03/07 19:09:11 version 1.19, 2003/03/21 15:59:14
Line 249  sub get_date_from_form { Line 249  sub get_date_from_form {
 ##############################################  ##############################################
 ##############################################  ##############################################
   
   =pod
   
   =item &javascript_nothing()
   
   Return an appropriate null for the users browser.  This is used
   as the first arguement for window.open calls when you want a blank
   window that you can then write to.
   
   =cut
   
   ##############################################
   ##############################################
   sub javascript_nothing {
       # mozilla and other browsers work with "''", but IE on mac does not.
       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 'explorer' && $user_os =~ 'mac') {
           $nothing = "'javascript:void(0);'";
       }
       return $nothing;
   }
   
   ##############################################
   ##############################################
   
   
   
 sub AscendOrderOptions {  sub AscendOrderOptions {
     my ($order, $page, $formName)=@_;      my ($order, $page, $formName)=@_;
   
Line 690  sub Increment_PrgWin { Line 724  sub Increment_PrgWin {
     } else {      } else {
  $time_est .= ' seconds';   $time_est .= ' seconds';
     }      }
       my $lasttime = time-$$prog_state{'laststart'};
       if ($lasttime == 1) {
           $lasttime = '('.$lasttime.' second for '.$extraInfo.')';
       } else {
           $lasttime = '('.$lasttime.' seconds for '.$extraInfo.')';
       }
     $r->print('<script>popwin.document.popremain.remaining.value="'.      $r->print('<script>popwin.document.popremain.remaining.value="'.
       $$prog_state{'done'}.'/'.$$prog_state{'max'}.        $$prog_state{'done'}.'/'.$$prog_state{'max'}.
       ': '.$time_est.' remaining ('.(time-$$prog_state{'laststart'}).        ': '.$time_est.' remaining '.$lasttime.'";'.'</script>');
       ' seconds for '.$extraInfo.')";'.'</script>');  
     $$prog_state{'laststart'}=time;      $$prog_state{'laststart'}=time;
     $r->rflush();      $r->rflush();
 }  }
Removed from v.1.16  
changed lines
  Added in v.1.19

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>