Use the integer value for teletext page in test.html.

diff --git a/projects/mozilla/test.html b/projects/mozilla/test.html
index 5733be4f619b0b8722895607abc3b692d55f7901..c693efc35bba25190b5b9b8b464fb23c3b26e832 100644 (file)
--- a/projects/mozilla/test.html
+++ b/projects/mozilla/test.html
@@ -58,14 +58,14 @@ function init(){
 \r
 function getVLC(name)\r
 {\r
-    if (window.document[name])
+    if (window.document[name])\r
     {\r
         return window.document[name];\r
     }\r
     if (navigator.appName.indexOf("Microsoft Internet")==-1)\r
     {\r
         if (document.embeds && document.embeds[name])\r
-            return document.embeds[name];
+            return document.embeds[name];\r
     }\r
     else // if (navigator.appName.indexOf("Microsoft Internet")!=-1)\r
     {\r
@@ -90,7 +90,7 @@ MRL:
 </TD></TR>\r
 <TR><TD align="center" colspan="2">\r
 <!--\r
-Insert VideoLAN.VLCPlugin.2
+Insert VideoLAN.VLCPlugin.2\r
 -->\r
 <OBJECT classid="clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921"\r
         width="640"\r
@@ -137,7 +137,7 @@ Insert Slider widget
 <INPUT type=button value="Fullscreen" onClick='getVLC("vlc").video.toggleFullscreen();'>\r
 <INPUT type=button value="Version" onClick='alert("vlc " + getVLC("vlc").VersionInfo);'>\r
 <INPUT type=button value=" State " onClick='doState();'>\r
-</TD><TD align="right">
+</TD><TD align="right">\r
 <SPAN style="text-align:center">Volume:</SPAN>\r
 <INPUT type=button value=" - " onClick='updateVolume(-10)'>\r
 <SPAN id="volumeTextField" style="text-align:center">--</SPAN>\r
@@ -145,19 +145,19 @@ Insert Slider widget
 <INPUT type=button value="Mute" onClick='getVLC("vlc").audio.toggleMute();'>\r
 </TD>\r
 </TR>\r
-<TR><TD>Playlist:
+<TR><TD>Playlist:\r
 <INPUT type=button value="Prev" onClick='getVLC("vlc").playlist.prev();'>\r
 <INPUT type=button value="Next" onClick='getVLC("vlc").playlist.next();'>\r
 <INPUT type=button value="Clear All" onClick='getVLC("vlc").playlist.clear(); doItemCount();'>\r
-    Aspect Ratio:
-    <SELECT readonly onChange='doAspectRatio(this.value)'>
-      <OPTION value="default">Default</OPTION>
-      <OPTION value="1:1">1:1</OPTION>
-      <OPTION value="4:3">4:3</OPTION>
-      <OPTION value="16:9">16:9</OPTION>
-      <OPTION value="221:100">221:100</OPTION>
-      <OPTION value="5:4">5:4</OPTION>
-    </SELECT>
+    Aspect Ratio:\r
+    <SELECT readonly onChange='doAspectRatio(this.value)'>\r
+      <OPTION value="default">Default</OPTION>\r
+      <OPTION value="1:1">1:1</OPTION>\r
+      <OPTION value="4:3">4:3</OPTION>\r
+      <OPTION value="16:9">16:9</OPTION>\r
+      <OPTION value="221:100">221:100</OPTION>\r
+      <OPTION value="5:4">5:4</OPTION>\r
+    </SELECT>\r
 </TD><TD align="right">\r
 <INPUT type=button id="itemCount" value=" Items 0 " onClick='doItemCount();'>\r
 <INPUT size=4 value="" id="removeid"><INPUT type=submit value="Delete" onClick="doRemoveItem(document.getElementById('removeid').value);">\r
@@ -197,20 +197,20 @@ Verbosity:
 <INPUT type=button value="get position" onClick='doGetPosition();'>\r
 </TD>\r
 </TR>\r
-<TR>
-<TD>Video Subtitle:
-    <INPUT type=button value=" + " onClick='doSubtitle(1);'>
-    <SPAN id="spuTextField" style="text-align:center">--</SPAN>
-    <INPUT type=button value=" - " onClick='doSubtitle(-1);'>
-</TD>
-</TR>
-<TR>
-<TD>
-    <INPUT type=button id="telx" value="Teletext off" onClick='doToggleTeletext();'>
-    Teletext page:
-    <INPUT size=4 value="100" id="telxPage" onClick="doTelxPage(document.getElementById('telxPage').value);">
-</TD>
-</TR>
+<TR>\r
+<TD>Video Subtitle:\r
+    <INPUT type=button value=" + " onClick='doSubtitle(1);'>\r
+    <SPAN id="spuTextField" style="text-align:center">--</SPAN>\r
+    <INPUT type=button value=" - " onClick='doSubtitle(-1);'>\r
+</TD>\r
+</TR>\r
+<TR>\r
+<TD>\r
+    <INPUT type=button id="telx" value="Teletext off" onClick='doToggleTeletext();'>\r
+    Teletext page:\r
+    <INPUT size=4 value="100" id="telxPage" onClick='doTelxPage(document.getElementById("telxPage").value);'>\r
+</TD>\r
+</TR>\r
 </TABLE>\r
 <SCRIPT language="javascript">\r
 <!--\r
@@ -221,7 +221,7 @@ var monitorTimerId = 0;
 var rateTimerId = 0;\r
 var inputTrackerScrolling = false;\r
 var inputTrackerIgnoreChange = false;\r
-var telxState = false;
+var telxState = false;\r
 \r
 function doSetSlider()\r
 {\r
@@ -298,40 +298,36 @@ function doAspectRatio(value)
 {\r
    var vlc = getVLC("vlc");\r
    vlc.video.aspectRatio = value;\r
-};
-
-function doSubtitle(value)
-{
-    var vlc = getVLC("vlc");
-    alert(vlc.video.subtitle + value);
-    vlc.video.subtitle = vlc.video.subtitle + value;
-    document.getElementById("spuTextField").innerHTML = vlc.video.subtitle;
-};
-
-function doTelxPage(value)
-{
-    var vlc = getVLC("vlc");
-    alert( value );
-    vlc.video.teletext = 889; //value;
-};
-
-function doToggleTeletext()
-{
-    var vlc = getVLC("vlc");
-
-    vlc.video.toggleTeletext();
-    if (telxState)
-    {
-        document.getElementById("telx").innerHTML = "Teletext on";
-        telxState = true;
-        alert( "telextext on" );
-    }
-    else
-    {
-        document.getElementById("telx").innerHTML = "Teletext off";
-        telxState = false;
-        alert( "telextext off" );
-    }
+};\r
+\r
+function doSubtitle(value)\r
+{\r
+    var vlc = getVLC("vlc");\r
+    vlc.video.subtitle = vlc.video.subtitle + value;\r
+    document.getElementById("spuTextField").innerHTML = vlc.video.subtitle;\r
+};\r
+\r
+function doTelxPage(value)\r
+{\r
+    var vlc = getVLC("vlc");\r
+    vlc.video.teletext = parseInt(value);\r
+};\r
+\r
+function doToggleTeletext()\r
+{\r
+    var vlc = getVLC("vlc");\r
+\r
+    vlc.video.toggleTeletext();\r
+    if (telxState)\r
+    {\r
+        document.getElementById("telx").innerHTML = "Teletext on";\r
+        telxState = true;\r
+    }\r
+    else\r
+    {\r
+        document.getElementById("telx").innerHTML = "Teletext off";\r
+        telxState = false;\r
+    }\r
 }\r
 \r
 function doItemCount()\r
@@ -399,7 +395,7 @@ function doState()
 \r
     if( newState == 0 )\r
     {\r
-        // current media has stopped
+        // current media has stopped\r
         onEnd();\r
     }\r
     else if( newState == 1 )\r
@@ -430,17 +426,17 @@ function doState()
     else if( newState == 6 )\r
     {\r
         // current media is playing forward\r
-       onForward();\r
+        onForward();\r
     }\r
     else if( newState == 7 )\r
     {\r
         // current media is playing backward\r
-       onBackward();\r
+        onBackward();\r
     }\r
     else if( newState == 8 )\r
     {\r
-       // current media has ended\r
-       onEnd();\r
+        // current media has ended\r
+        onEnd();\r
     }\r
     else if( newState == 9 )\r
     {\r
@@ -465,7 +461,7 @@ function monitor()
             {\r
                 alert( msg.message );\r
             }\r
-           document.getElementById("message").innerHTML = msg.message;\r
+            document.getElementById("message").innerHTML = msg.message;\r
         }\r
         // clear the log once finished to avoid clogging\r
         vlc.log.messages.clear();\r
@@ -475,7 +471,7 @@ function monitor()
     {\r
         if( newState == 0 )\r
         {\r
-            // current media has stopped
+            // current media has stopped\r
             onEnd();\r
         }\r
         else if( newState == 1 )\r
@@ -498,27 +494,27 @@ function monitor()
             // current media is now paused\r
             onPause();\r
         }\r
-       else if( newState == 5 )\r
-       {\r
-           // current media has stopped\r
-            onStop();\r
-       }\r
-       else if( newState == 6 )\r
-       {\r
-           // current media is playing forward\r
-           onForward();\r
-       }\r
-       else if( newState == 7 )\r
-       {\r
-           // current media is playing backward\r
-           onBackward();\r
-       }\r
-       else if( newState == 8 )\r
-       {\r
-           // current media has ended\r
+        else if( newState == 5 )\r
+        {\r
+            // current media has stopped\r
+                onStop();\r
+        }\r
+        else if( newState == 6 )\r
+        {\r
+            // current media is playing forward\r
+            onForward();\r
+        }\r
+        else if( newState == 7 )\r
+        {\r
+            // current media is playing backward\r
+            onBackward();\r
+        }\r
+        else if( newState == 8 )\r
+        {\r
+            // current media has ended\r
             onEnd();\r
         }\r
-       else if( newState == 9 )\r
+        else if( newState == 9 )\r
         {\r
             // current media encountered error\r
             onError();\r
@@ -593,11 +589,11 @@ function doPlayOrPause()
     if( vlc.playlist.isPlaying )\r
     {\r
         vlc.playlist.togglePause();\r
-       monitor();\r
+        monitor();\r
     }\r
     else if( vlc.playlist.itemCount > 0 )\r
     {\r
-       // clear the message log and enable error logging\r
+        // clear the message log and enable error logging\r
         vlc.log.verbosity = 1;\r
         vlc.log.messages.clear();\r
         vlc.playlist.play();\r
@@ -605,7 +601,7 @@ function doPlayOrPause()
     }\r
     else\r
     {\r
-       // disable log\r
+        // disable log\r
         vlc.log.verbosity = -1;\r
         alert('nothing to play !');\r
     }\r
@@ -725,7 +721,7 @@ function onStop()
     // disable logging\r
     vlc.log.verbosity = -1;\r
 \r
-    if( !inputTracker.disabled )
+    if( !inputTracker.disabled )\r
     {\r
         inputTracker.setValue(inputTracker.minVal);\r
         inputTracker.setDisabled(true);\r