Fix quoting and escaping of JS fragments

NB jQuery $('#id') in a string looks like an [expr ...] to Jim!
This commit is contained in:
df 2021-04-17 01:55:33 +00:00
parent 8bbc28d3c2
commit 243dfdd595
1 changed files with 9 additions and 9 deletions

View File

@ -283,9 +283,10 @@ if {$type ne "ts" || ("ODEncrypted" ni $flags && $url eq "") } {
</tr>" </tr>"
set hasffmpeg 1 set hasffmpeg 1
} elseif {$type eq "ts" && $url ne ""} { } elseif {$type eq "ts" && $url ne ""} {
puts { <script type="text/javascript"> } puts [format {
puts "$('#playDL').attr('href','$url').enable(); <script type="text/javascript">
puts { </script> } $('#playDL').attr('href','%s').enable();
</script> } $url]
} }
puts " puts "
</table> </table>
@ -293,10 +294,9 @@ puts "
if {$hasffmpeg} { if {$hasffmpeg} {
set url "/browse/ffmpeg.jim?file=[cgi_quote_url $file]" set url "/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
puts { <script type="text/javascript"> } puts [format {
puts "var url = \"$url\";" <script type="text/javascript">
puts { var url = "%s";
$('#ffmpeg').load(url, function() { $('#play, #playDL').enable(); }); $('#ffmpeg').load(url, function() { $('#play, #playDL').enable(); }); }
</script> </script> } $url]
}
} }