--- loncom/xml/scripttag.pm 2010/05/26 12:22:54 1.155
+++ loncom/xml/scripttag.pm 2011/12/19 01:49:32 1.160
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# ".&mt('Script Vars')."
";
- &Apache::lonxml::add_script_result($script_var);
+ &Apache::lonxml::add_script_result(
+ &Apache::loncommon::modal_adhoc_window($function_name,500,500,
+ '
'.&Apache::run::dump($target,$safeeval).'
',
+ &mt('Script Vars'))."
");
}
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
@@ -309,7 +293,6 @@ sub start_window {
$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
$result.=&Apache::edit::text_arg('Height:','height',$token,5);
$result.=&Apache::edit::text_arg('Width:','width',$token,5);
- $result.=&Apache::edit::text_arg('Mime Type:','mimetype',$token,5);
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -326,39 +309,16 @@ sub end_window {
my $result;
if ($target eq 'web' || $target eq 'webgrade') {
my $output=&Apache::lonxml::endredirection;
- $output =~ s/[\n\r]/ /g;
-# $output = &HTML::Entities::encode($output,'<>&"\'');
- $output =~ s/\'/\\\'/g;
my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);
if (!$linktext) { $linktext='*'; }
my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
if (!$width) { $width='500'; }
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
if (!$height) { $height='200'; }
- my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval)
- || 'text/html';
my ($start_page,$end_page);
- if ($mimetype eq 'text/html') {
- $start_page =
- &Apache::loncommon::start_page($linktext, undef,
- {'only_body' => 1,
- 'bgcolor' => '#FFFFFF',
- 'js_ready' => 1,});
- $end_page =
- &Apache::loncommon::end_page({'js_ready' => 1,});
- }
- $result = "$linktext";
+ $result=&Apache::loncommon::modal_adhoc_window
+ ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext);
} elsif ($target eq 'tex') {
$result = '}';
} else {
@@ -440,7 +400,7 @@ sub start_import {
if ($id) {
$result.='" id="'.$id;
}
- $result.='">';
+ $result.='" importmode="'.$token->[2]{'importmode'}.'">';
$result.=$bodytext;
$result.='';
}
@@ -627,7 +587,7 @@ sub start_algebra {
$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);
- $result=&Apache::lontexconvert::algebra($inside,undef,$target,$style,$parstack,$safeeval);
+ $result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval);
}
$Apache::lonxml::post_evaluate=0;
}