Skip to content

V
vlc
Commit 18a26247 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

luahttp: fix document parsing with inline javascript

parent 6c18d169
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 9 deletions
share/lua/http/dialogs/batch_window.html
View file @ 18a26247
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[
$(function(){ $(function(){
$('#window_batch').dialog({ $('#window_batch').dialog({
autoOpen: false, autoOpen: false,
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
} }
}); });
}) })
//]]>
</script> </script>
<div id="window_batch" title="VLM Batch Commands"> <div id="window_batch" title="VLM Batch Commands">
<textarea id="batchCommand" cols="50" rows="16"> <textarea id="batchCommand" cols="50" rows="16">
......
share/lua/http/dialogs/browse_window.html
View file @ 18a26247
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
//<![CDATA[
var browse_target = 'default'; var browse_target = 'default';
$(function(){ $(function(){
$('#window_browse').dialog({ $('#window_browse').dialog({
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
} }
}); });
}); });
//]]>
</script> </script>
<div id="window_browse" title="Media Browser"> <div id="window_browse" title="Media Browser">
......
share/lua/http/dialogs/create_stream.html
View file @ 18a26247
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
//<![CDATA[
$(function(){ $(function(){
$('#stream_out_method').change(function(){ $('#stream_out_method').change(function(){
$('#output_options').empty(); $('#output_options').empty();
...@@ -129,6 +130,7 @@ ...@@ -129,6 +130,7 @@
return inCode+transCode+outCode; return inCode+transCode+outCode;
} }
//]]>
</script> </script>
<div id="window_create_stream" title="Create Stream"> <div id="window_create_stream" title="Create Stream">
<table width="100%"> <table width="100%">
......
share/lua/http/dialogs/equalizer_window.html
View file @ 18a26247
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
//<![CDATA[
var bands = new Array('60Hz','170Hz','310Hz','600Hz','1kHz','3kHz','6kHz','12kHz','14kHz','16kHz'); var bands = new Array('60Hz','170Hz','310Hz','600Hz','1kHz','3kHz','6kHz','12kHz','14kHz','16kHz');
$(function(){ $(function(){
$('#window_equalizer').dialog({ $('#window_equalizer').dialog({
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
} }
}); });
}); });
//]]>
</script> </script>
<div id="window_equalizer" title="Graphical Equalizer"> <div id="window_equalizer" title="Graphical Equalizer">
<div style="margin: 5px 5px 5px 5px;"> <div style="margin: 5px 5px 5px 5px;">
......
share/lua/http/dialogs/mosaic_window.html
View file @ 18a26247
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
//<![CDATA[
$(function(){ $(function(){
$('#window_mosaic').dialog({ $('#window_mosaic').dialog({
autoOpen: false, autoOpen: false,
...@@ -86,6 +87,7 @@ ...@@ -86,6 +87,7 @@
function() { $(this).removeClass('ui-state-hover'); } function() { $(this).removeClass('ui-state-hover'); }
); );
} }
//]]>
</script> </script>
<div id="window_mosaic" title="Create Mosaic"> <div id="window_mosaic" title="Create Mosaic">
......
share/lua/http/dialogs/offset_window.html
View file @ 18a26247
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
//<![CDATA[
$(function(){ $(function(){
$('#window_offset').dialog({ $('#window_offset').dialog({
autoOpen: false, autoOpen: false,
...@@ -61,6 +62,7 @@ ...@@ -61,6 +62,7 @@
} }
}); });
}); });
//]]>
</script> </script>
<div id="window_offset" title="Track Synchronisation"> <div id="window_offset" title="Track Synchronisation">
<div>Playback Rate</div> <div>Playback Rate</div>
......
share/lua/http/dialogs/stream_window.html
View file @ 18a26247
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
//<![CDATA[
var stream_server = window.location.hostname; var stream_server = window.location.hostname;
function configureStreamWindow(stream_protocol,stream_server,stream_port,stream_file){ function configureStreamWindow(stream_protocol,stream_server,stream_port,stream_file){
$('#stream_protocol').val(stream_protocol); $('#stream_protocol').val(stream_protocol);
...@@ -49,6 +50,7 @@ ...@@ -49,6 +50,7 @@
}) })
$('#stream_host').val(stream_server); $('#stream_host').val(stream_server);
}); });
//]]>
</script> </script>
<div id="stream_status_" style="visibility:hidden;display:none;"> <div id="stream_status_" style="visibility:hidden;display:none;">
<h3><a href="#" id="stream_title_"></a></h3> <h3><a href="#" id="stream_title_"></a></h3>
......
share/lua/http/index.html
View file @ 18a26247
...@@ -28,9 +28,11 @@ ...@@ -28,9 +28,11 @@
<link href="favicon.ico" type="image/x-icon" rel="shortcut icon" /> <link href="favicon.ico" type="image/x-icon" rel="shortcut icon" />
<script type="text/javascript" src="js/common.js"></script> <script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[
if(isMobile()){ if(isMobile()){
window.location='mobile.html'; window.location='mobile.html';
} }
//]]>
</script> </script>
<link type="text/css" href="css/ui-lightness/jquery-ui-1.8.13.custom.css" rel="stylesheet" /> <link type="text/css" href="css/ui-lightness/jquery-ui-1.8.13.custom.css" rel="stylesheet" />
<link type="text/css" href="css/main.css" rel="stylesheet" /> <link type="text/css" href="css/main.css" rel="stylesheet" />
...@@ -41,6 +43,7 @@ ...@@ -41,6 +43,7 @@
<script type="text/javascript" src="js/ui.js"></script> <script type="text/javascript" src="js/ui.js"></script>
<script type="text/javascript" src="js/controlers.js"></script> <script type="text/javascript" src="js/controlers.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[
var pollStatus = true; var pollStatus = true;
$(function(){ $(function(){
$('.button').hover(function(){$(this).addClass('ui-state-hover')},function(){$(this).removeClass('ui-state-hover')}); $('.button').hover(function(){$(this).addClass('ui-state-hover')},function(){$(this).removeClass('ui-state-hover')});
...@@ -185,6 +188,7 @@ ...@@ -185,6 +188,7 @@
}); });
$('#viewContainer').animate({height: 'toggle'}); $('#viewContainer').animate({height: 'toggle'});
}); });
//]]>
</script> </script>
</head> </head>
<body> <body>
......
share/lua/http/view.html
View file @ 18a26247
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>
<script type="text/javascript" src="http://static.flowplayer.org/js/flowplayer-3.2.6.min.js"></script> <script type="text/javascript" src="http://static.flowplayer.org/js/flowplayer-3.2.6.min.js"></script>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
//<![CDATA[
$(function(){ $(function(){
$('#window_stream').resizable({ $('#window_stream').resizable({
minHeight: 300, minHeight: 300,
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
$('#player').attr('href',$('#stream_protocol').val()+'://'+$('#stream_host').val()+':'+$('#stream_port').val()+'/'+$('#stream_file').val()); $('#player').attr('href',$('#stream_protocol').val()+'://'+$('#stream_host').val()+':'+$('#stream_port').val()+'/'+$('#stream_file').val());
flowplayer("player", "http://releases.flowplayer.org/swf/flowplayer-3.2.7.swf"); flowplayer("player", "http://releases.flowplayer.org/swf/flowplayer-3.2.7.swf");
}); });
//]]>
</script> </script>
<style> <style>
#window_stream { width: 800px; height: 600px; padding: 0.5em; } #window_stream { width: 800px; height: 600px; padding: 0.5em; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment