From 8678c2c1597f17e49f4fa1f04fbbd14ce573ae73 Mon Sep 17 00:00:00 2001 From: Rick Waldron Date: Tue, 19 Jul 2011 12:50:45 -0400 Subject: [PATCH 1/2] [#654] Implements new api pass-through methods: preload playbackRate autoplay loop controls muted buffered readyState seeking paused played seekable ended --- popcorn.js | 6 ++++-- test/popcorn.unit.js | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/popcorn.js b/popcorn.js index f7a6b6d4d..fead2e500 100644 --- 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 = {}; @@ -741,7 +742,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 index 570e76f1f..f111eff1d 100644 --- 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(); From a58c66f9fd6de812bdf01c147b0e1d8f176b4163 Mon Sep 17 00:00:00 2001 From: Rick Waldron Date: Fri, 22 Jul 2011 18:21:35 -0400 Subject: [PATCH 2/2] [#654] Fixes per review --- popcorn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popcorn.js b/popcorn.js index fead2e500..91acf7e1a 100644 --- a/popcorn.js +++ b/popcorn.js @@ -450,7 +450,7 @@ } - if ( arg !== false && arg !== null && typeof arg !== "undefined" ) { + if ( arg != null ) { this.media[ name ] = arg;