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

Added fix for h5swf Flash version checking. (Issue 90)

Browse Source 
Added fix for iPhone move in dom var. (Issue 84)
This commit is contained in:
Steve Heffernan 2011-11-18 15:53:00 -08:00
parent 7da9bdd073
commit 193172498c
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/compare/compare.html
View File

@ -62,14 +62,14 @@
<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'>
<!-- <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" 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'>
<!-- <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm'> -->
</video>
</td>
<td colspan="2">

3
dev/compare/compare.js
View File

@ -16,6 +16,8 @@ $(function(){
var eventsId = "#"+this+"_events",
type = evt.type,
prev = $(eventsId+" div").first();
if (type == 'error') _V_.log(evt);
if (prev && prev.html() && prev.html().indexOf(type + " ") === 0) {
var countSpan = prev.children(".count");
@ -45,6 +47,7 @@ $(function(){
result = (result.length > 0) ? "s:"+result.start(0)+" e:"+result.end(0) : "-";
}
} catch(e) {
_V_.log(e);
result = "<span class='na'>N/A</span>";
}
$("#"+this.currentTechName+prop).html(result);

1
dev/src/_begin.js
View File

@ -2,6 +2,7 @@
VideoJS - HTML5 Video Player
Version 3.0 BETA
LGPL v3 LICENSE INFO
This file is part of VideoJS. Copyright 2011 Zencoder, Inc.
VideoJS is free software: you can redistribute it and/or modify

2
dev/src/api.js
View File

@ -182,7 +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++) {

3
dev/src/core.js
View File

@ -382,6 +382,7 @@ VideoJS.fn = VideoJS.prototype = {
} else {
this.pause();
this.currentTime(0);
this.pause();
}
},
@ -410,7 +411,7 @@ VideoJS.fn = VideoJS.prototype = {
localStorage[key] = value;
} catch(e) {
if (e.code == 22 || e.code == 1014) { // Webkit == 22 / Firefox == 1014
// this.warning(VideoJS.warnings.localStorageFull);
_V_.log("VideoJS: LocalStorage Full")
}
}
}

7
dev/src/tech/h5swf.js
View File

@ -3,8 +3,7 @@ VideoJS.tech.h5swf = {
swf: "https://s3.amazonaws.com/video-js/3.0b/video-js.swf",
// swf: "http://video-js.zencoder.com/3.0b/video-js.swf",
supported: function(){
/* TODO Check for flash, etc. */
return true;
return swfobject.hasFlashPlayerVersion("9");
},
canPlaySource: function(sourceObj){
if (sourceObj.type in _V_.tech.h5swf.supports.format) { return "maybe"; }
@ -93,8 +92,8 @@ VideoJS.tech.h5swf = {
}
},
onSWFErrorEvent: function(swfID, eventName){
_V_.log("Error", eventName);
onSWFErrorEvent: function(swfID, eventName){
_V_.log("Flash (H5SWF) Error", eventName);
},
api: {

7
dev/src/tech/html5.js
View File

@ -110,7 +110,10 @@ VideoJS.tech.html5 = {
try {
this.tels.html5.webkitEnterFullScreen();
} catch (e) {
if (e.code == 11) { this.warning(VideoJS.warnings.videoNotReady); }
if (e.code == 11) {
// this.warning(VideoJS.warnings.videoNotReady);
_V_.log("VideoJS: Video not ready.")
}
}
},
src: function(src){ this.tels.html5.src = src; },
@ -152,7 +155,7 @@ VideoJS.tech.html5 = {
// iOS
if (_V_.isIOS()) {
// If you move a video element in the DOM, it breaks video playback.
_V_.tech.supports.movingElementInDOM = false;
_V_.tech.html5.supports.movingElementInDOM = false;
}
// Android