version 1.164, 2011/12/23 19:38:01
|
version 1.166, 2012/08/07 14:50:17
|
Line 109 sub start_script {
|
Line 109 sub start_script {
|
$env{'form.counter'},$Apache::lonxml::curdepth); |
$env{'form.counter'},$Apache::lonxml::curdepth); |
&Apache::lonxml::add_script_result( |
&Apache::lonxml::add_script_result( |
&Apache::loncommon::modal_adhoc_window($function_name,500,500, |
&Apache::loncommon::modal_adhoc_window($function_name,500,500, |
'<pre>'.&Apache::run::dump($target,$safeeval).'</pre>', |
'<pre style="background-color:#ffffff;">'. |
|
&Apache::run::dump($target,$safeeval).'</pre>', |
&mt('Script Vars'))."<br />"); |
&mt('Script Vars'))."<br />"); |
} |
} |
} elsif ($target eq "edit" ) { |
} elsif ($target eq "edit" ) { |
Line 126 sub start_script {
|
Line 127 sub start_script {
|
if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') { |
if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') { |
$result = $token->[4]; |
$result = $token->[4]; |
$result.=$bodytext; |
$result.=$bodytext; |
|
if ($type eq "text/javascript") { |
|
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); |
|
if (($src =~ /\.js$/) && ($src !~ m{^(/|https?://)})) { |
|
my ($path,$scriptname) = ($src =~ m{^(.+)/([^/]*)$}); |
|
my $docuri = |
|
$Apache::lonnet::env{'request.noversionuri'}; |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum\E)/(docs/.*/)[^/]+$}) { |
|
my $prefix = $1; |
|
my $relpath = $2; |
|
my $cleanrelpath; |
|
foreach my $dir (split(/\//,$relpath.$path)) { |
|
next if ($dir eq '.'); |
|
if ($dir eq '..') { |
|
$cleanrelpath =~ s{([^/]+/)$}{}; |
|
} else { |
|
$cleanrelpath .= $dir.'/'; |
|
} |
|
} |
|
$cleanrelpath =~ s{/$}{}; |
|
if ($cleanrelpath ne '') { |
|
$src = $prefix.'/'.$cleanrelpath.'/'.$scriptname; |
|
} else { |
|
$src = $prefix.'/'.$scriptname; |
|
} |
|
if ($src ne '') { |
|
&Apache::lonxml::extlink($src); |
|
} |
|
} |
|
} |
|
} |
} |
} |
} |
} |
return $result; |
return $result; |