Merge remote branch 'rwldrn/t654' into develop

jbuck · Jul 27, 2011 · a9e39fb · a9e39fb
2 parents 875e9d8 + a58c66f
commit a9e39fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/popcorn.js b/popcorn.js
@@ -433,7 +433,8 @@
   //  an object with defined methods
   Popcorn.extend(Popcorn.p, (function() {
 
-      var methods = "load play pause currentTime playbackRate mute volume duration",
+      var methods = "load play pause currentTime playbackRate mute volume duration preload playbackRate " +
+                    "autoplay loop controls muted buffered readyState seeking paused played seekable ended",
           ret = {};
 
 
@@ -449,7 +450,7 @@
           }
 
 
-          if ( arg !== false && arg !== null && typeof arg !== "undefined" ) {
+          if ( arg != null ) {
 
             this.media[ name ] = arg;
 
@@ -751,7 +752,8 @@
 
   //  Protected API methods
   Popcorn.protect = {
-    natives: "load play pause currentTime playbackRate mute volume duration removePlugin roundTime trigger listen unlisten exec".toLowerCase().split( /\s+/ )
+    natives: ( "load play pause currentTime playbackRate mute volume duration removePlugin roundTime trigger listen unlisten exec" +
+              "preload playbackRate autoplay loop controls muted buffered readyState seeking paused played seekable ended" ).toLowerCase().split( /\s+/ )
   };
 
   // Internal Only - Adds track events to the instance object

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
@@ -390,9 +390,10 @@ test( "Object", function () {
 
   var popped = Popcorn( "#video" ),
       popObj = Popcorn( document.getElementById( "video" ) ),
-      methods = "load play pause currentTime mute volume roundTime exec removePlugin",
+      methods = "load play pause currentTime mute volume roundTime exec removePlugin duration " +
+                "preload playbackRate autoplay loop controls volume muted buffered readyState seeking paused played seekable ended",
       count = 0,
-      expects = 30;
+      expects = 60;
 
   expect( expects );
 
@@ -499,7 +500,7 @@ test("roundTime", function () {
 
 });
 
-
+  
 test("exec", function () {
 
   QUnit.reset();