web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-12-31 03:11:11 +02:00
Code Releases Activity

Updated to new version of SWF

Browse Source
This commit is contained in:
Steve Heffernan 2011-11-17 16:54:02 -08:00
parent c5a22081b4
commit df3718cd55
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dev/compare/compare.html
View File

@ -59,22 +59,21 @@
<tr><th colspan="2">HTML5</th><th colspan="2">H5Swf</th><th colspan="2">YouTube</th></tr>
<tr>
<td colspan="2">
<video id="vid1" class="video-js vjs-default-skin" preload="none" width="480" height="198"
poster="http://video-js.zencoder.com/oceans-clip.png"
>
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4'>
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm'>
</video>
</td>
<td colspan="2">
<video id="vid2" class="video-js vjs-default-skin" preload="none" width="480" height="198"
<video id="vid1" class="video-js vjs-default-skin" controls preload="none" width="480" height="198"
poster="http://video-js.zencoder.com/oceans-clip.png">
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4'>
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm'>
</video>
</td>
<td colspan="2">
<video id="vid3" class="video-js vjs-default-skin" preload="none" width="480" height="198">
<video id="vid2" class="video-js vjs-default-skin" controls preload="none" width="480" height="198"
poster="http://video-js.zencoder.com/oceans-clip.png">
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4'>
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm'>
</video>
</td>
<td colspan="2">
<video id="vid3" class="video-js vjs-default-skin" controls preload="none" width="480" height="198">
<source src="http://www.youtube.com/watch?v=YjaZNYSt7o0" type='video/youtube'>
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4'>
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm'>

4
dev/compare/compare.js
View File

@ -1,6 +1,6 @@
$(function(){
var tech, i,
techList = ["html5","h5swf","youtube"],
techList = ["html5","h5swf"],
props = "error,currentSrc,networkState,buffered,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoWidth,videoHeight,textTracks,preload,currentTime,playbackRate,autoplay,loop,controls,volume,muted,defaultMuted".split(","),
methods = "play,pause,src,load,canPlayType,addTextTrack",
notUsed = "mediaGroup,controller,videoTracks,audioTracks,defaultPlaybackRate";
@ -9,6 +9,8 @@ $(function(){
for (i=0; i < techList.length; i++) {
tech = techList[i];
_V_.log(_V_.el("vid"+(i+1)))
var player = _V_("vid"+(i+1), { "techOrder":[tech] });
_V_.each(_V_.html5Events, function(evt){

BIN
dev/flash/VideoJS.swf
View File

Binary file not shown.

1
dev/src/api.js
View File

@ -182,6 +182,7 @@ VideoJS.fn.extend({
src: function(source){
// Case: Array of source objects to choose from and pick the best to play
if (source instanceof Array) {
_V_.log(this.options.techOrder);
techLoop: // Named loop for breaking both loops
// Loop through each playback technology in the options order
for (var i=0,j=this.options.techOrder;i<j.length;i++) {

6
dev/src/core.js
View File

@ -18,7 +18,7 @@ var VideoJS = _V_ = function(id, addOptions, ready){
if (!(this instanceof arguments.callee)) {
// Return the player attr on the element if it exists
// Otherwise set up a new player.
return tag.player || new VideoJS(id, options, ready);
return tag.player || new VideoJS(id, addOptions, ready);
}
this.tag = tag; // Store the original tag used to set options
@ -81,6 +81,8 @@ var VideoJS = _V_ = function(id, addOptions, ready){
_V_.merge(options, this.getVideoTagSettings()); // Override with Video Tag Options
_V_.merge(options, addOptions); // Override/extend with options from setup call
_V_.log(addOptions)
// Empty video tag sources and tracks so the built in player doesn't use them also.
if (tag.hasChildNodes()) {
for (var i=0,j=tag.childNodes;i<j.length;i++) {
@ -132,7 +134,7 @@ var VideoJS = _V_ = function(id, addOptions, ready){
}, _V_ = VideoJS;
VideoJS.options = {
techOrder: ["html5","flowplayer","h5swf"],
techOrder: ["html5","h5swf","flowplayer"],
controlSets: ["bigPlayButton", "bar", "subtitlesBox"/*, "replay"*/],
controlSetOptions: {
bigPlayButton: {},