Changeset 923

Timestamp:

04/07/10 18:01:00 (3 years ago)

Author:

zach

Message:

• Logger handles instances with no console
• Parser ignores null / empty string elements
• Multiple source files now use first file for failover

Location:

trunk/html5

Files:

• index.html (modified) (1 diff)
• src/jquery.jwplayerUtils.js (modified) (1 diff)
• src/jquery.jwplayerUtilsParsersDOMElementParser.js (modified) (1 diff)
• src/jquery.jwplayerUtilsParsersDOMMediaElementParser.js (modified) (1 diff)
• src/jquery.jwplayerView.js (modified) (3 diffs)

trunk/html5/index.html

@@ -49 +49 @@
 
 
+<h4>Test 3: Using multiple sources</h4>
+<video
+        id="player1"
+        class="jwplayer"
+        width="480"
+        height="270"
+        poster="http://developer.longtailvideo.com/player/testing/files/bunny.jpg"
+>
+<source src='http://developer.longtailvideo.com/player/testing/files/bunny.mp4' type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'>
+<source src='http://developer.longtailvideo.com/player/testing/files/bunny.ogv' type='video/ogg; codecs="theora, vorbis"'>
+</video>
+
 
 </body>

trunk/html5/src/jquery.jwplayerUtils.js

@@ -107 +107 @@
 
 
-$.fn.log = function (msg) {
-        console.log("%s: %o", msg, this);
+$.fn.log = function (msg, obj) {
+        try {
+                console.log("%s: %o", msg, obj);
+        } catch (err) {
+        }
         return this;
 };

trunk/html5/src/jquery.jwplayerUtilsParsersDOMElementParser.js

@@ -32 +32 @@
                 for (var attribute in attributes) {
                         if (attribute != "length") {
-                                configuration[attributes[attribute]] = $(domElement).attr(attribute);
+                                var value = $(domElement).attr(attribute);
+                                if (!(value == "" || value == undefined)) {
+                                        configuration[attributes[attribute]] = $(domElement).attr(attribute);
+                                }
                         }
                 }

trunk/html5/src/jquery.jwplayerUtilsParsersDOMMediaElementParser.js

@@ -26 +26 @@
         var sources = [];
         $("source",domElement).each(function() {
-                sources[sources.length] = $.fn.jwplayerUtilsParsersDOMSourceElementParser.parse(domElement);
+                sources[sources.length] = $.fn.jwplayerUtilsParsersDOMSourceElementParser.parse(this);
         });
         var configuration = $.fn.jwplayerUtilsParsersDOMElementParser.parse(domElement, attributes);
+        if (configuration['file'] != undefined) {
+                sources[0] = {'file':configuration['file']};
+        }
         configuration['sources'] = sources;
         return configuration;

trunk/html5/src/jquery.jwplayerView.js

@@ -13 +13 @@
 /** Embeds a Flash Player at the specified location in the DOM. **/
 $.fn.jwplayerView.embedFlash = function(domElement, model) {
-        $.fn.log($.fn.jwplayerUtils.dump(model));
         if (navigator.plugins && navigator.mimeTypes && navigator.mimeTypes.length) {
                 $(domElement).replaceWith("<embed " + 
@@ -24 +23 @@
                         "allowfullscreen='true' " + 
                         "allowscriptaccess='always' " + 
-                        "flashvars='file=" + model.file + "&image=" + model.image + "' " + 
+                        "flashvars='file=" + model.sources[0].file + "&image=" + model.image + "' " + 
                         "/>"
                 );
@@ -33 +32 @@
                         "<param name='allowscriptaccess' value='always'>" + 
                         "<param name='wmode' value='transparent'>" + 
-                        "<param name='flashvars' value='file=" + model.file + "&image=" + model.image + "'>" + 
+                        "<param name='flashvars' value='file=" + model.sources[0].file + "&image=" + model.image + "'>" + 
                         "</object>"
                 );