loncom/xml/scripttag.pm - diff

Return to scripttag.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/scripttag.pm between versions 1.134.2.2 and 1.141

-version 1.134.2.2, 2006/03/29 22:48:08
+version 1.141, 2007/06/11 20:52:40
  Line 116  sub start_script {
  	    ($env{'form.answer_output_mode'} ne 'tex') &&
  	    ($Apache::lonhomework::viewgrades == 'F')) {
  	    $Apache::lonxml::evaluate--;
- 	    my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
+ 	    my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
  	    my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
- 	    $result.="<script type=\"text/javascript\">
+ 	    my $start_page =
+ 		&Apache::loncommon::start_page('Script Vars', undef,
+ 					       {'only_body' => 1,
+ 						'bgcolor'   => '#FFFFFF',
+ 						'js_ready'  => 1,});
+ 	    my $end_page =
+ 		&Apache::loncommon::end_page({'js_ready' => 1,});
+ 	    $uname =~s/\W//g;
+ 	    $udom  =~s/\W//g;
+ 	    my $script_var ="<script type=\"text/javascript\">
  // <![CDATA[
-     function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('<html><head><title>Script Vars</title></head><body bgcolor=\"#FFFFFF\"><pre>";
+     function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>";
  	    my $listing=&Apache::run::dump($target,$safeeval);
  	    $listing=~s/\\/\\\\/g;
  	    $listing=~s/\'/\\\'/g;
- 	    $result.=$listing;
+ 	    $script_var.=$listing;
- 	    $result.= "</pre></body></html>');newWindow.document.close();newWindow.focus()}
+ 	    $script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
  // ]]>
  </script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
+ 	    &Apache::lonxml::add_script_result($script_var);
  	}
      } elsif ($target eq "edit" ) {
        #&Apache::run::run($bodytext,$safeeval);
- Line 334  sub end_window {
+ Line 345  sub end_window {
      if (!$width) { $width='500'; }
      my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
      if (!$height) { $height='200'; }
-     $result = "<script type=\"text/javascript\"> function LONCAPA_newwindow_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=$width,height=$height,scrollbars=1');newWindow.document.open('text/html','replace');newWindow.document.writeln('<html><head><title>newwindow</title></head><body bgcolor=\"#FFFFFF\"> $output </body></html>');newWindow.document.close();}</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
+     my $start_page =
+ 	&Apache::loncommon::start_page($linktext, undef,
+ 				       {'only_body' => 1,
+ 					'bgcolor'   => '#FFFFFF',
+ 					'js_ready'  => 1,});
+     my $end_page =
+ 	&Apache::loncommon::end_page({'js_ready' => 1,});
+     $result = "<script type=\"text/javascript\">
+ //<!--
+  function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
+ newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
+ newWindow.".&Apache::lonhtmlcommon::javascript_docopen().";
+ newWindow.document.writeln('$start_page $output $end_page');
+ newWindow.document.close();}
+ //-->
+ </script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
    } elsif ($target eq 'tex') {
        $result = '}';
    } else {

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

Removed from v.1.134.2.2
changed lines
	Added in v.1.141