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

Fixed issue with flash fallback no showing in firefox.

Browse Source
This commit is contained in:
Steve Heffernan 2010-11-22 14:59:19 -08:00
parent c9f32ba437
commit e9f23dfe1c
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/src/behaviors.js
View File

@ -21,7 +21,8 @@ VideoJS.player.newBehavior("player", function(player){
// Buffer Full
this.onBufferedUpdate(this.isBufferFull);
},{
playerOnVideoError: function(event){
playerOnVideoError: function(event){
this.log(event);
this.log(this.video.error);
},
playerOnVideoPlay: function(event){ this.hasPlayed = true; },

5
dev/src/html5.js
View File

@ -436,8 +436,9 @@ VideoJS.player.extend({
this.values.bufferStart = 0;
this.values.bufferEnd = 0;
}
if (this.video.buffered && this.video.buffered.length > 0 && this.video.buffered.end(0) > this.values.bufferEnd) {
this.values.bufferEnd = this.video.buffered.end(0);
if (this.video.buffered && this.video.buffered.length > 0) {
var newEnd = this.video.buffered.end(0);
if (newEnd > this.values.bufferEnd) { this.values.bufferEnd = newEnd; }
}
return [this.values.bufferStart, this.values.bufferEnd];
},

4
dev/src/video.js
View File

@ -193,7 +193,7 @@ VideoJS.flashPlayers.htmlObject = {
this.triggerResizeListeners();
return this;
}
return this.element.offsetWidth;
return this.element.width;
},
height: function(height){
if (height !== undefined) {
@ -202,7 +202,7 @@ VideoJS.flashPlayers.htmlObject = {
this.triggerResizeListeners();
return this;
}
return this.element.offsetHeight;
return this.element.height;
}
}
};

2
dev/test.html
View File

@ -82,7 +82,7 @@
<video data-subtitles="../demo-subtitles.srt" id="example_video_1" class="video-js" width="640" height="264" controls="controls" preload="none" poster="http://video-js.zencoder.com/oceans-clip.png">
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' />
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm; codecs="vp8, vorbis"' />
<source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg; codecs="theora, vorbis"' />
<!-- <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg; codecs="theora, vorbis"' /> -->
<!-- <track kind="subtitles" src="../demo-subtitles.srt" srclang="en-US" label="English"></track> -->
<!-- Flash Fallback. Use any flash video player here. Make sure to keep the vjs-flash-fallback class. -->
<object id="flash_fallback_1" class="vjs-flash-fallback" width="640" height="264" type="application/x-shockwave-flash"