--- loncom/xml/scripttag.pm	2005/04/07 06:56:27	1.126
+++ loncom/xml/scripttag.pm	2005/09/14 18:25:40	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.126 2005/04/07 06:56:27 albertel Exp $
+# $Id: scripttag.pm,v 1.130 2005/09/14 18:25:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,8 +105,8 @@ sub start_script {
     if ( $target eq "modified" ) {
 	$result=$token->[4].&Apache::edit::modifiedfield('/script',$parser);
     } elsif ( $target eq 'web' || $target eq 'tex' ||
-	      $target eq 'grade' || $target eq 'answer' ||
-	      $target eq 'analyze' ) {
+	      $target eq 'grade' || $target eq 'webgrade' ||
+	      $target eq 'answer' || $target eq 'analyze' ) {
 	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
 	if (!$Apache::lonxml::default_homework_loaded) {
 	    &Apache::lonxml::default_homework_load($safeeval);
@@ -122,11 +122,10 @@ sub start_script {
 // <![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>";
 	    my $listing=&Apache::run::dump($target,$safeeval);
+	    $listing=~s/\\/\\\\/g;
 	    $listing=~s/\'/\\\'/g;
-	    $listing=~s/\n/\\n/g;
-	    $listing=~s/\r/\\r/g;
 	    $result.=$listing;
-	    $result.= "</pre></body></html>');newWindow.document.close();}
+	    $result.= "</pre></body></html>');newWindow.document.close();newWindow.focus()}
 // ]]>
 </script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
 	}
@@ -173,8 +172,8 @@ sub start_display {
   if ( $target eq "modified" ) {
       $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser);
   } elsif ( $target eq 'web' || $target eq 'tex' ||
-	    $target eq 'grade' || $target eq 'answer' ||
-	      $target eq 'analyze') {
+	    $target eq 'grade' || $target eq 'webgrade' ||
+	    $target eq 'answer' || $target eq 'analyze') {
       my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
       if (!$Apache::lonxml::default_homework_loaded) {
 	  &Apache::lonxml::default_homework_load($safeeval);
@@ -314,7 +313,7 @@ sub start_window {
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						     $safeeval,'linttext',
+						     $safeeval,'linktext',
 						     'width','height');
 	if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
     }
