Merge branch 't453' into 0.5

Conflicts: players/youtube/popcorn.youtube.js
happynewye · Apr 21, 2011 · 4c9dd95 · 4c9dd95
2 parents 4c15ecb + a0ae78b
commit 4c9dd95
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
@@ -27,7 +27,7 @@ var onYouTubePlayerReady;
   // 0.05 sec tolerance between old and new times to determine if currentTime has been set programatically
   // 250 ms progress interval as specified by WHATWG
   var timeupdateInterval = 33,
-      timeCheckInterval = 0.5
+      timeCheckInterval = 0.5,
       progressInterval = 250;
 
   // Ready State Constants
@@ -62,7 +62,7 @@ var onYouTubePlayerReady;
     var matches = url.match( /((http:\/\/)?www\.)?youtube\.[a-z]+\/watch\?v\=[a-z0-9]+/i );    
     // Return id, which comes after first equals sign
     return matches ? matches[0].split( "=" )[1] : "";
-  };
+  }
 
   // Extract the id from a player url
   function extractIdFromUri( url ) {
@@ -73,8 +73,8 @@ var onYouTubePlayerReady;
     var matches = url.match( /^http:\/\/?www\.youtube\.[a-z]+\/e\/[a-z0-9]+/i );
 
     // Return id, which comes after first equals sign
-    return matches ? matches[0].split( "/e/" )[1] : ""
-  };
+    return matches ? matches[0].split( "/e/" )[1] : "";
+  }
 
   function getPlayerAddress( vidId, playerId ) {
     if( !vidId ) {
@@ -148,7 +148,7 @@ var onYouTubePlayerReady;
     // Issue load event
     vid.dispatchEvent( 'load' );
     vid.dispatchEvent( "durationchange" );
-  }
+  };
 
   Popcorn.youtube = function( elementId, url, options ) {
     return new Popcorn.youtube.init( elementId, url, options );
@@ -495,7 +495,7 @@ var onYouTubePlayerReady;
           self = this;
 
       // do nothing if size is not yet determined
-      if ( bytesToLoad == 0 ) {
+      if ( bytesToLoad === 0 ) {
         return;
       }