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.156 and 1.159

version 1.156, 2010/06/02 21:27:50	version 1.159, 2011/12/10 18:11:05
Line 102 sub start_script {	Line 102 sub start_script {
($Apache::lonhomework::viewgrades == 'F')) {	($Apache::lonhomework::viewgrades == 'F')) {
$Apache::lonxml::evaluate--;	$Apache::lonxml::evaluate--;
my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();	my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
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;	$uname =~s/\W//g;
$udom =~s/\W//g;	$udom =~s/\W//g;
my $function_name =	my $function_name =
join('_','LONCAPA_scriptvars',$uname,$udom,	join('_','LONCAPA_scriptvars',$uname,$udom,
$env{'form.counter'},$Apache::lonxml::curdepth);	$env{'form.counter'},$Apache::lonxml::curdepth);
my $script_var ="<script type=\"text/javascript\">	&Apache::lonxml::add_script_result(
// <![CDATA[	&Apache::loncommon::modal_adhoc_window($function_name,500,500,
function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>";	'<pre>'.&Apache::run::dump($target,$safeeval).'</pre>',
my $listing=&Apache::run::dump($target,$safeeval);	&mt('Script Vars'))."<br />");
$listing=~s/\\/\\\\/g;
$listing=~s/\'/\\\'/g;
$script_var.=$listing;
$script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
// ]]>
</script><a href=\"javascript:$function_name();void(0);\">".&mt('Script Vars')."</a><br />";
&Apache::lonxml::add_script_result($script_var);
}	}
} elsif ($target eq "edit" ) {	} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);	#&Apache::run::run($bodytext,$safeeval);
Line 627 sub start_algebra {	Line 611 sub start_algebra {
$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);	$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze') {	if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze') {
my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);	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;	$Apache::lonxml::post_evaluate=0;
}	}

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

Removed from v.1.156
changed lines
	Added in v.1.159