Changeset 1206 for trunk/js/test/index.php

Timestamp:

08/12/10 19:06:46 (3 years ago)

Author:

pablo

Message:

Integrating embedder and API into testing tool.

File:

• trunk/js/test/index.php (modified) (8 diffs)

trunk/js/test/index.php

@@ -7 +7 @@
 <script type="text/javascript" src="settings.js"></script>
 <script type="text/javascript" src="../bin-debug/jwplayer.js"></script>
+<script type="text/javascript" src="../../html5/jwplayer.html5.js"></script>
 <script type="text/javascript">
 
@@ -237 +238 @@
    }
    
+   function registerobjectembed() {
+           player = jwplayer('preview');
+           player.setPlayer(document.getElementById('preview'));
+   }
    
    function swfobjectembed(){
@@ -244 +249 @@
                 $('#preview').css('height',vrs['height']);
                 $('#preview').html('<div id="container"></div>');
-                var player = "";
+                var playerLocation = "";
                 var players = eval($('#player').val());
                 for (var plr in players){
                         if (players[plr]['type'] == 'flash'){
-                                player = players[plr]['src'];
+                                playerLocation = players[plr]['src'];
                         }
                 }
                 swfobject.embedSWF(
-                        player,
+                        playerLocation,
                         'container',
                         vrs['width'],
@@ -260 +265 @@
                         vrs,
                         {allowfullscreen:'true',allowscriptaccess:'always'},
-                        {id:'player',name:'player'}
+                        {id:'newPlayer',name:'newPlayer'}
                 );
                 var lnk = 'http://developer.longtailvideo.com/trac/testing/';
                 $("#permalink").val(lnk+'?'+$.param(variables));
+                player = jwplayer('newPlayer');
+                player.setPlayer(document.getElementById('newPlayer'));
    }
 
@@ -279 +286 @@
         }
 
-        jwplayer('preview').setup($.extend(vrs, {
+        player = jwplayer('preview').setup($.extend(vrs, {
                 "players": eval($('#player').val()),
                 "events": events
@@ -307 +314 @@
         /** Reference to the player **/
         var player;
-        /** When the player is ready and the API forms can be shown, display them. **/
-        function playerReady(obj) {
-                player = document.getElementById(obj['id']);
-        };
+
         /** Get a variable from the player. **/
         function getVariable(evt) {
@@ -339 +343 @@
                         }
                 }
-                player[typ](dat);
+                if (dat.toString == "") {
+                        player[typ]();
+                } else {
+                        player[typ](dat);
+                }
         };
         /** Set a listener to the player. **/
@@ -364 +372 @@
         function alertValue(obj) {
                 var txt = '';
-                for (itm in obj) {
-                        if(typeof(obj[itm]) == 'object') {
-                                txt += itm+':\n';
-                                for (ent in obj[itm]) {
-                                        txt += '  '+ent+': '+obj[itm][ent]+'\n';
-                                }
-                        } else {
-                                txt += itm+': '+obj[itm]+'\n';
-                        }
-                }
-                alert(txt);
+                if (typeof obj == "object") {
+                        for (itm in obj) {
+                                if(typeof(obj[itm]) == 'object') {
+                                        txt += itm+':\n';
+                                        for (ent in obj[itm]) {
+                                                txt += '  '+ent+': '+obj[itm][ent]+'\n';
+                                        }
+                                } else {
+                                        txt += itm+': '+obj[itm]+'\n';
+                                }
+                        }
+                        alert(txt);
+                } else {
+                        alert(obj)
+                }
         };