Merge branch 'feature/fixing-cdn-version-var'

CHANGELOG.md

@@ -1,3 +1,4 @@
+* Fixed CDN Version which was breaking dev.html
 * Made full-window mode more independent
 * Added rakefile for release generation
 --------------------------------------------------------------------------------

Rakefile

@@ -73,11 +73,12 @@ namespace :build do
     end
 
     Dir.foreach('src') do |item|
-      next if (['.', '..', '.DS_Store', '_end.js'] + first_files).include? item
+      next if (['.', '..', '.DS_Store', 'setup.js', '_end.js'] + first_files).include? item
       combined << File.read("src/#{item}")
     end
 
     combined << File.read("flash/swfobject.js")
+    combined << File.read("src/setup.js")
     combined << File.read("src/_end.js")
 
     Rake::Log["Adding version number"]

src/_begin.js

@@ -21,5 +21,4 @@ along with Video.js.  If not, see <http://www.gnu.org/licenses/>.
 
 // Self-executing function to prevent global vars and help with minification
 ;(function(window, undefined){
-  var document = window.document,
-      CDN_VERSION = "GENERATED_CDN_VSN";
+  var document = window.document;

src/_end.js

@@ -2,8 +2,5 @@
 // Expose to global
 window.VideoJS = window._V_ = VideoJS;
 
-// Run Auto-load players
-_V_.autoSetup();
-
 // End self-executing function
 })(window);

src/core.js

@@ -38,7 +38,10 @@ var VideoJS = function(id, addOptions, ready){
 },
 
 // Shortcut
-_V_ = VideoJS;
+_V_ = VideoJS,
+
+// CDN Version. Used to target right flash swf.
+CDN_VERSION = "GENERATED_CDN_VSN";
 
 VideoJS.players = {};
 

src/setup.js

@@ -1,4 +1,6 @@
 _V_.addEvent(window, "load", function(){
   _V_.windowLoaded = true;
 });
-_V_.autoSetupTimeout();
+
+// Run Auto-load players
+_V_.autoSetup();