[vlc-devel] [PATCH 01/17] test pages: Use HTML5 standards and fix invalid HTML
Daniel Amm
da2424 at t-online.de
Sun Jun 14 00:35:37 CEST 2015
---
share/test/resize.html | 13 +++++--------
share/test/simple.html | 11 ++++++-----
share/test/test.html | 36 +++++++++++++++++-------------------
share/test/windowless.html | 24 +++++++++++-------------
4 files changed, 39 insertions(+), 45 deletions(-)
mode change 100644 => 100755 share/test/resize.html
mode change 100644 => 100755 share/test/simple.html
mode change 100644 => 100755 share/test/test.html
mode change 100644 => 100755 share/test/windowless.html
diff --git a/share/test/resize.html b/share/test/resize.html
old mode 100644
new mode 100755
index 7e8ed07..41071b9
--- a/share/test/resize.html
+++ b/share/test/resize.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
<html>
<head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>VLC Resizing Test Page</title>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
- <style>
+ <style type="text/css">
#video_window {
position: absolute;
left: 50px;
@@ -13,7 +13,7 @@
height: 300px;
}
</style>
- <script language="Javascript">
+ <script type="text/javascript">
var isMoving = false;
var isResizing = false;
@@ -88,13 +88,10 @@
<input type="button" onclick="ToggleMoving()" value="Toggle Moving"/>
<div id="video_window">
<embed type="application/x-vlc-plugin"
- version="VideoLAN.VLCPlugin.2"
width="100%" height="100%"
target="http://streams.videolan.org/streams/mp4/h264-sample-thefluff.mp4"
toolbar="false"
- id="vlc_control"
- >
- </embed>
+ id="vlc_control" />
</div>
</body>
</html>
diff --git a/share/test/simple.html b/share/test/simple.html
old mode 100644
new mode 100755
index b0df687..cc2b5cb
--- a/share/test/simple.html
+++ b/share/test/simple.html
@@ -1,6 +1,8 @@
+<!DOCTYPE html>
<html>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>Simplest VLC plugin test</title>
-<script language="javascript">
+<script type="text/javascript">
function play(tgt) {
var uri = "http://streams.videolan.org/streams/mp4/Mr_MrsSmith-h264_aac.mp4";
@@ -19,12 +21,11 @@ function reload() {
<body onload="play('vlc1')">
<h1>Simplest VLC plugin test</h1>
-<OBJECT id='vlc1_IE' codeBase=http://downloads.videolan.org/pub/videolan/vlc/latest/win32/axvlc.cab height=240 width=320 classid=clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921>
-<embed type="application/x-vlc-plugin" pluginspage="http://www.videolan.org" version="VideoLAN.VLCPlugin.2"
+<OBJECT id='vlc1_IE' height=240 width=320 classid=clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921>
+<embed type="application/x-vlc-plugin" pluginspage="http://www.videolan.org"
width="320"
height="240"
- id="vlc1">
-</embed>
+ id="vlc1" />
</OBJECT>
<hr>
diff --git a/share/test/test.html b/share/test/test.html
old mode 100644
new mode 100755
index a1b62b2..3ba9911
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -1,7 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE html>
<html>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>VLC Plugin test page</TITLE>
-<style>
+<style type="text/css">
.inputTrackerInput {
height:20;
width:30;
@@ -10,7 +11,7 @@
}
</style>
-<script language="JavaScript"><!--
+<script type="text/javascript"><!--
function init()
{
if( navigator.appName.indexOf("Microsoft Internet")==-1 )
@@ -229,7 +230,7 @@ function close()
//--></script>
-<body onLoad="init();" onClose="close();">
+<body onLoad="init();" onUnLoad="close();">
<div style="width: 600; height: 200; top:200px; position: absolute; border: 1pt solid black; background: blue; border-radius: 5px; display: none;" id="overlay"></div>
<table>
@@ -239,7 +240,7 @@ MRL:
<input type=submit value="Go" onClick="doGo(document.getElementById('targetTextField').value);">
<input type=submit value="Add" onClick="doAdd(document.getElementById('targetTextField').value);">
</td></tr>
-<tr><td align="center" colspan="2">
+<tr><td style="text-align:center" colspan="2">
<!--
Insert VideoLAN.VLCPlugin.2
@@ -247,8 +248,7 @@ Insert VideoLAN.VLCPlugin.2
<object classid="clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921"
width="640"
height="480"
- id="vlc"
- events="True">
+ id="vlc">
<param name="MRL" value="" />
<param name="ShowDisplay" value="True" />
<param name="AutoLoop" value="False" />
@@ -258,7 +258,6 @@ Insert VideoLAN.VLCPlugin.2
<param name="StartTime" value="0" />
<EMBED pluginspage="http://www.videolan.org"
type="application/x-vlc-plugin"
- version="VideoLAN.VLCPlugin.2"
width="640"
height="480"
toolbar="true"
@@ -267,18 +266,17 @@ Insert VideoLAN.VLCPlugin.2
text="Waiting for video"
bgcolor="#000000"
allowfullscreen="true"
- name="vlc">
-</EMBED>
+ name="vlc" />
</object>
</td></tr>
<tr><td colspan="2">
<table><tr>
-<td valign="top" width="550">
+<td style="vertical-align:top; width:550px;">
<!--
Insert Slider widget
-->
<div id="inputTrackerDiv"></div>
-</td><td width="15%">
+</td><td style="width:15%">
<div id="info" style="text-align:center">-:--:--/-:--:--</div>
<div id="state" style="text-align:center">Stopped...</div>
</td></tr></table>
@@ -294,7 +292,7 @@ Insert Slider widget
<input type=button value="Fullscreen" onClick='getVLC("vlc").video.toggleFullscreen();'>
<input type=button value="Version" onClick='alert("vlc " + getVLC("vlc").VersionInfo);'>
<input type=button value=" State " onClick='alert("state: " + getVLC("vlc").input.state);'>
-</td><td align="right">
+</td><td style="text-align:right">
<SPAN style="text-align:center">Volume:</SPAN>
<input type=button value=" - " onClick='updateVolume(-10)'>
<SPAN id="volumeTextField" style="text-align:center">--</SPAN>
@@ -307,7 +305,7 @@ Insert Slider widget
<input type=button value="Next" onClick='getVLC("vlc").playlist.next();'>
<input type=button value="Clear All" onClick='doPlaylistClearAll();'>
Aspect Ratio:
- <select readonly onChange='doAspectRatio(this.value)'>
+ <select onChange='doAspectRatio(this.value)'>
<option value="default">Default</option>
<option value="1:1">1:1</option>
<option value="4:3">4:3</option>
@@ -315,13 +313,13 @@ Insert Slider widget
<option value="221:100">221:100</option>
<option value="5:4">5:4</option>
</select>
-</td><td align="right">
+</td><td style="text-align:right">
<input type=button id="itemCount" value=" Items 0 " onClick='doItemCount();'>
<input size=4 value="" id="removeid"><input type=submit value="Delete" onClick="doRemoveItem(document.getElementById('removeid').value);">
</td>
</tr>
<tr><td>Audio Channel:
- <select readonly onClick='doAudioChannel(this.value);'>
+ <select onClick='doAudioChannel(this.value);'>
<option value=1>Stereo</option>
<option value=2>Reverse Stereo</option>
<option value=3>Left</option>
@@ -366,7 +364,7 @@ Insert Slider widget
<input type=button value="Enable" onClick='getVLC("vlc").video.marquee.enable();'>
<input type=button value="Disable" onClick='getVLC("vlc").video.marquee.disable();'>
<input size=4 value="" id="marqueeIntValue">
- <select readonly onClick="doMarqueeOption(this.value,document.getElementById('marqueeIntValue').value);">
+ <select onClick="doMarqueeOption(this.value,document.getElementById('marqueeIntValue').value);">
<option value=1>Color</option>
<option value=2>Opacity</option>
<option value=3>Position</option>
@@ -384,7 +382,7 @@ Insert Slider widget
<input type=button value="Enable" onClick='getVLC("vlc").video.logo.enable();'>
<input type=button value="Disable" onClick='getVLC("vlc").video.logo.disable();'>
<input size=4 value="" id="logoIntValue">
- <select readonly onClick="doLogoOption(this.value,document.getElementById('logoIntValue').value);">
+ <select onClick="doLogoOption(this.value,document.getElementById('logoIntValue').value);">
<option value=1>File</option>
<option value=2>Position</option>
<option value=3>Opacity</option>
@@ -403,7 +401,7 @@ Insert Slider widget
</td>
</tr>
</table>
-<SCRIPT language="javascript">
+<SCRIPT type="text/javascript">
<!--
var rate = 0;
diff --git a/share/test/windowless.html b/share/test/windowless.html
old mode 100644
new mode 100755
index 9ab2240..145f60a
--- a/share/test/windowless.html
+++ b/share/test/windowless.html
@@ -1,7 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE html>
<html>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>VLC windowless Plugin test page</TITLE>
-<style>
+<style type="text/css">
.inputTrackerInput {
height:20;
width:30;
@@ -11,7 +12,7 @@
body {background: grey;}
</style>
-<script language="JavaScript"><!--
+<script type="text/javascript"><!--
function init()
{
if( navigator.appName.indexOf("Microsoft Internet")==-1 )
@@ -230,11 +231,11 @@ function close()
//--></script>
-<body onLoad="init();" onClose="close();">
+<body onLoad="init();" onUnLoad="close();">
<div style="width: 800; height: 200; top:200px; position: absolute; border: 1pt solid black; background: blue; border-radius: 5px; display: none;" id="overlay"></div>
<table>
-<tr><td align="center" colspan="2">
+<tr><td style="text-align:center;" colspan="2">
<div id=player>
<!--
@@ -243,9 +244,7 @@ Insert VideoLAN.VLCPlugin.2
<object classid="clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921"
width="640"
height="480"
- id="vlc"
- windowless="True"
- events="True">
+ id="vlc">
<param name="MRL" value="" />
<param name="ShowDisplay" value="True" />
<param name="AutoLoop" value="False" />
@@ -253,9 +252,9 @@ Insert VideoLAN.VLCPlugin.2
<param name="Volume" value="50" />
<param name="toolbar" value="true" />
<param name="StartTime" value="0" />
+<param name="Windowless" value="True" />
<EMBED pluginspage="http://www.videolan.org"
type="application/x-vlc-plugin"
- version="VideoLAN.VLCPlugin.2"
width="640"
height="480"
toolbar="true"
@@ -264,8 +263,7 @@ Insert VideoLAN.VLCPlugin.2
windowless="true"
bgcolor="#000000"
branding="true"
- name="vlc">
-</EMBED>
+ name="vlc" />
</object>
</div>
@@ -280,7 +278,7 @@ MRL:
<tr><td>
<input type=button id="PlayOrPause" value=" Play " onClick='doPlayOrPause();'>
<input type=button value="Stop" onClick='doStop();'>
-</td><td width="15%">
+</td><td style="width:15%">
<div id="info" style="text-align:center">-:--:--/-:--:--</div>
<div id="state" style="text-align:center">Stopped...</div>
</td>
@@ -293,7 +291,7 @@ MRL:
</td>
</tr>
</table>
-<SCRIPT language="javascript">
+<SCRIPT type="text/javascript">
<!--
var rate = 0;
--
2.1.4
More information about the vlc-devel
mailing list