Bump version to 4.2.1

CHANGELOG.md

@@ -6,6 +6,9 @@ _(none)_
 
 --------------------
 
+## 4.2.1 (2013-09-09)
+* Fixed an infinite loop caused by loading the library asynchronously ([view](https://github.com/videojs/video.js/pull/727))
+
 ## 4.2.0 (2013-09-04)
 * Added LESS as a CSS preprocessor for the default skin ([view](https://github.com/videojs/video.js/pull/644))
 * Exported MenuButtons for use in the API ([view](https://github.com/videojs/video.js/pull/648))

Gruntfile.js

@@ -210,7 +210,8 @@ module.exports = function(grunt) {
                 + ' --js_output_file=' + dest
                 + ' --create_source_map ' + dest + '.map --source_map_format=V3'
                 + ' --jscomp_warning=checkTypes --warning_level=VERBOSE'
-                + ' --output_wrapper "/*! Video.js v' + version.full + ' ' + pkg.copyright + ' */ (function() {%output%})();//@ sourceMappingURL=video.js.map"';
+                + ' --output_wrapper "/*! Video.js v' + version.full + ' ' + pkg.copyright + ' */ (function() {%output%})();"';
+                //@ sourceMappingURL=video.js.map
 
     // Add each js file
     grunt.file.expand(filePatterns).forEach(function(file){

package.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "copyright": "Copyright 2013 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
   "keywords": [
     "html5",

src/js/setup.js

@@ -53,9 +53,13 @@ vjs.autoSetupTimeout = function(wait){
   setTimeout(vjs.autoSetup, wait);
 };
 
-vjs.one(window, 'load', function(){
+if (document.readyState === 'complete') {
   vjs.windowLoaded = true;
-});
+} else {
+  vjs.one(window, 'load', function(){
+    vjs.windowLoaded = true;
+  });
+}
 
 // Run Auto-load players
 // You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version)