web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-11-28 08:58:46 +02:00
Code Releases Activity

Merge branch 'master' of github.com:zencoder/video-js

Browse Source
This commit is contained in:
Steve Heffernan 2011-10-03 16:01:38 -07:00
commit 449c7014fb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/build/combine_sources.sh
View File

@ -35,4 +35,4 @@ cat ../src/controls/subtitlesBox.js >> ../dist/video.js
cat ../src/autoload.js >> ../dist/video.js
cat ../src/_end.js >> ../dist/video.js
cat ../src/_end.js >> ../dist/video.js

2
dev/src/core.js
View File

@ -94,7 +94,7 @@ var VideoJS = _V_ = function(id, options){
};
VideoJS.options = {
techOrder: ["h5swf","html5","flowplayer"],
techOrder: ["html5","flowplayer","h5swf"],
controlSets: ["bigPlayButton", "bar", "subtitlesBox"/*, "replay"*/],
controlSetOptions: {
bigPlayButton: {},

4
video.js
View File

@ -98,7 +98,7 @@ var VideoJS = _V_ = function(id, options){
};
VideoJS.options = {
techOrder: ["html5","h5swf","flowplayer"],
techOrder: ["html5","flowplayer","h5swf"],
controlSets: ["bigPlayButton", "bar", "subtitlesBox"/*, "replay"*/],
controlSetOptions: {
bigPlayButton: {},
@ -3281,4 +3281,4 @@ _V_.loadPlayerTimeout(1); // Let vjs javascript finish executing
window.VideoJS = window._V_ = VideoJS;
// End self-executing function
})(window);
})(window);