Merge pull request #51 from dseif/t1056

[#1056] Fixed issue where vimeo was firing loadeddata prematurely
mozilla · May 7, 2012 · 6ed2b2a · 6ed2b2a
2 parents 72b4c54 + 915ab77
commit 6ed2b2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/players/vimeo/popcorn.vimeo.js b/players/vimeo/popcorn.vimeo.js
@@ -49,8 +49,8 @@
           vimeoObject = document.getElementById( vimeoContainer.id );
 
           vimeo_player_loaded.seek[ vimeoContainer.id ] = function( time ) {
-            if( time !== currentTime ) {
-              currentTime = time;
+            if( time.seconds !== currentTime ) {
+              currentTime = time.seconds;
               media.dispatchEvent( "seeked" );
               media.dispatchEvent( "timeupdate" );
             }
@@ -206,11 +206,11 @@
             }
           });
 
-          media.dispatchEvent( "loadedmetadata" );
-          media.dispatchEvent( "loadeddata" );
 
           media.duration = vimeoObject.api_getDuration();
           media.dispatchEvent( "durationchange" );
+          media.dispatchEvent( "loadedmetadata" );
+          media.dispatchEvent( "loadeddata" );
           volumeUpdate();
           media.readyState = 4;
           media.dispatchEvent( "canplaythrough" );
@@ -249,4 +249,4 @@
       }
     }
   });
-})();
+})();
diff --git a/players/vimeo/popcorn.vimeo.unit.js b/players/vimeo/popcorn.vimeo.unit.js
@@ -32,7 +32,7 @@ asyncTest( "Options Check", function() {
 asyncTest( "Update Timer", function() {
 
   var p2 = Popcorn.vimeo( "#player_1", "http://player.vimeo.com/video/11336811" ),
-      expects = 16,
+      expects = 17,
       count = 0,
       execCount = 0,
       // These make sure events are only fired once
@@ -65,6 +65,9 @@ asyncTest( "Update Timer", function() {
     p2.unlisten( "loadedmetadata" );
     ok( true, "'loadedmetadata' fired" );
     plus();
+    // make sure that we always have a duration at this point
+    ok( this.duration() > 0, "Videos duration is greather than 0" );
+    plus();
   });
 
   p2.listen( "durationchange", function() {