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

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.228 and 1.230

version 1.228, 2009/08/03 16:34:16 version 1.230, 2009/08/10 16:27:39
Line 978  sub Create_PrgWin { Line 978  sub Create_PrgWin {
   
  #the whole function called through timeout is due to issues   #the whole function called through timeout is due to issues
  #in mozilla Read BUG #2665 if you want to know the whole story   #in mozilla Read BUG #2665 if you want to know the whole story
  &r_print($r,'<script type="text/javascript">'.   &r_print($r,&Apache::lonhtmlcommon::scripttag(
         '// <![CDATA['.  
         "var popwin;          "var popwin;
          function openpopwin () {           function openpopwin () {
          popwin=open(\'\',\'popwin\',\'width=400,height=100\');".           popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
Line 990  sub Create_PrgWin { Line 989  sub Create_PrgWin {
       &mt('Starting').'" /><\\/form>'.$end_page.        &mt('Starting').'" /><\\/form>'.$end_page.
               "\');".                "\');".
         "popwin.document.close();}".          "popwin.document.close();}".
         "\nwindow.setTimeout(openpopwin,0)".          "\nwindow.setTimeout(openpopwin,0)"
         '// ]]>'.      ));
         '</script>');  
  $prog_state{'formname'}='popremain';   $prog_state{'formname'}='popremain';
  $prog_state{'inputname'}="remaining";   $prog_state{'inputname'}="remaining";
     } elsif ($type eq 'inline') {      } elsif ($type eq 'inline') {
Line 1025  sub Create_PrgWin { Line 1023  sub Create_PrgWin {
 # update progress  # update progress
 sub Update_PrgWin {  sub Update_PrgWin {
     my ($r,$prog_state,$displayString)=@_;      my ($r,$prog_state,$displayString)=@_;
     &r_print($r,'<script type="text/javascript">'.      &r_print($r,&Apache::lonhtmlcommon::scripttag(
         '// <![CDATA['.  
         $$prog_state{'window'}.'.document.'.          $$prog_state{'window'}.'.document.'.
      $$prog_state{'formname'}.'.'.          $$prog_state{'formname'}.'.'.
      $$prog_state{'inputname'}.'.value="'.          $$prog_state{'inputname'}.'.value="'.
      $displayString.'";'.          $displayString.'";'
         '// ]]>'.      ));
         '</script>');  
     $$prog_state{'laststart'}=&Time::HiRes::time();      $$prog_state{'laststart'}=&Time::HiRes::time();
 }  }
   
Line 1085  sub Increment_PrgWin { Line 1081  sub Increment_PrgWin {
     if ($user_browser eq 'explorer' && $user_os =~ 'mac') {      if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
         $lasttime = '';          $lasttime = '';
     }      }
     &r_print($r,'<script>'.      &r_print($r,&Apache::lonhtmlcommon::scripttag(
         '// <![CDATA['.  
         $$prog_state{'window'}.'.document.'.          $$prog_state{'window'}.'.document.'.
      $$prog_state{'formname'}.'.'.          $$prog_state{'formname'}.'.'.
      $$prog_state{'inputname'}.'.value="'.          $$prog_state{'inputname'}.'.value="'.
      $$prog_state{'done'}.'/'.$$prog_state{'max'}.          $$prog_state{'done'}.'/'.$$prog_state{'max'}.
      ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.          ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'
         '// ]]>'.      ));
         '</script>');  
     $$prog_state{'laststart'}=&Time::HiRes::time();      $$prog_state{'laststart'}=&Time::HiRes::time();
 }  }
   
Line 1101  sub Increment_PrgWin { Line 1095  sub Increment_PrgWin {
 sub Close_PrgWin {  sub Close_PrgWin {
     my ($r,$prog_state)=@_;      my ($r,$prog_state)=@_;
     if ($$prog_state{'type'} eq 'popup') {      if ($$prog_state{'type'} eq 'popup') {
         &r_print($r,'<script>'.          &r_print($r,&Apache::lonhtmlcommon::scripttag(
             '// <![CDATA['.              'popwin.close()'
             'popwin.close()'.          ));
             '// ]]>'.  
             '</script>'."\n");  
     } elsif ($$prog_state{'type'} eq 'inline') {      } elsif ($$prog_state{'type'} eq 'inline') {
  &Update_PrgWin($r,$prog_state,&mt('Done'));   &Update_PrgWin($r,$prog_state,&mt('Done'));
     }      }
Line 1272  sub htmlareaselectactive { Line 1264  sub htmlareaselectactive {
     my @fields=@_;      my @fields=@_;
     unless (&htmlareabrowser()) { return ''; }      unless (&htmlareabrowser()) { return ''; }
     if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }      if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
     my $output='<script type="text/javascript" defer="1">'      my $output='<script type="text/javascript" defer="1">'."\n"
               .'// <![CDATA[';                .'// <![CDATA['."\n";
     my $lang = &htmlarea_lang();      my $lang = &htmlarea_lang();
     foreach my $field (@fields) {      foreach my $field (@fields) {
  $output.="   $output.="
Line 1287  sub htmlareaselectactive { Line 1279  sub htmlareaselectactive {
 }";  }";
     }      }
     $output.="\nwindow.status='Activated Editfields';\n"      $output.="\nwindow.status='Activated Editfields';\n"
             .'// ]]>'              .'// ]]>'."\n"
             .'</script><br />'.              .'</script><br />'.
  &disablelink(@fields);   &disablelink(@fields);
     return $output;      return $output;
Line 2117  sub inittags { Line 2109  sub inittags {
 }  }
   
   
   # USAGE: scripttag(scriptcode, true/false);
   #
   # EXAMPLES: 
   #  - scripttag("alert('Hello World!')") 
   #
   # NOTES:
   # - works currently only for javascripts
   #
   # OUTPUT: Scriptcode properly enclosed in <script> and CDATA tags (and LC
   # Internal markers if 2nd argument evaluates to true)
   sub scripttag {
       my ($content, $internal) = @_;
       $content = "// BEGIN LON-CAPA Internal\n$content\n// END LON-CAPA Internal" if $internal;
       $content = "\n// <![CDATA[\n$content\n// ]]>\n";
       htmltag("script", $content, {type => "text/javascript"});
       return htmltag("script", $content, {type => "text/javascript"});
   };
   
   
 ##############################################  ##############################################
 ##############################################  ##############################################
   
Removed from v.1.228  
changed lines
  Added in v.1.230

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