mirror of
https://github.com/videojs/video.js.git
synced 2024-12-25 02:42:10 +02:00
Release 4.11.1
This commit is contained in:
parent
3d16a4378c
commit
daa66b9183
@ -2,10 +2,13 @@ CHANGELOG
|
||||
=========
|
||||
|
||||
## HEAD (Unreleased)
|
||||
* @heff fixed a code bug in track XHR requests ([view](https://github.com/videojs/video.js/pull/1715))
|
||||
_(none)_
|
||||
|
||||
--------------------
|
||||
|
||||
## 4.11.1 (2014-12-04)
|
||||
* @heff fixed a code bug in track XHR requests ([view](https://github.com/videojs/video.js/pull/1715))
|
||||
|
||||
## 4.11.0 (2014-12-04)
|
||||
* @rutkat updated sliders to use keydown instead of keyup for more responsive key control ([view](https://github.com/videojs/video.js/pull/1616))
|
||||
* @toloudis fixed an issue with checking for an existing source on the video element ([view](https://github.com/videojs/video.js/pull/1651))
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "video.js",
|
||||
"description": "An HTML5 and Flash video player with a common API and skin for both.",
|
||||
"version": "4.11.0",
|
||||
"version": "4.11.1",
|
||||
"main": [
|
||||
"dist/video-js/video.js",
|
||||
"dist/video-js/video-js.css",
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "video.js",
|
||||
"description": "An HTML5 and Flash video player with a common API and skin for both.",
|
||||
"version": "4.11.0",
|
||||
"version": "4.11.1",
|
||||
"keywords": [
|
||||
"videojs",
|
||||
"html5",
|
||||
|
2
dist/video-js/video-js.css
vendored
2
dist/video-js/video-js.css
vendored
@ -1,6 +1,6 @@
|
||||
/*!
|
||||
Video.js Default Styles (http://videojs.com)
|
||||
Version 4.11.0
|
||||
Version 4.11.1
|
||||
Create your own skin at http://designer.videojs.com
|
||||
*/
|
||||
/* SKIN
|
||||
|
2
dist/video-js/video-js.min.css
vendored
2
dist/video-js/video-js.min.css
vendored
File diff suppressed because one or more lines are too long
2
dist/video-js/video.dev.js
vendored
2
dist/video-js/video.dev.js
vendored
@ -8181,7 +8181,7 @@ vjs.TextTrack.prototype.load = function(){
|
||||
// Only load if not loaded yet.
|
||||
if (this.readyState_ === 0) {
|
||||
this.readyState_ = 1;
|
||||
vjs.xhr(this.src_, vjs.bind(function(err, response, responseBody){
|
||||
vjs.xhr(this.src_, vjs.bind(this, function(err, response, responseBody){
|
||||
if (err) {
|
||||
return this.onError(err);
|
||||
}
|
||||
|
4
dist/video-js/video.js
vendored
4
dist/video-js/video.js
vendored
@ -1,4 +1,4 @@
|
||||
/*! Video.js v4.11.0 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */
|
||||
/*! Video.js v4.11.1 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */
|
||||
(function() {var b=void 0,f=!0,k=null,l=!1;function m(){return function(){}}function n(a){return function(){return this[a]}}function r(a){return function(){return a}}var s;document.createElement("video");document.createElement("audio");document.createElement("track");function t(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(t.Fa[a])return t.Fa[a];a=t.w(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new t.Player(a,c,d)}
|
||||
var videojs=window.videojs=t;t.Yb="4.11";t.ed="https:"==document.location.protocol?"https://":"http://";
|
||||
t.options={techOrder:["html5","flash"],html5:{},flash:{},width:300,height:150,defaultVolume:0,playbackRates:[],inactivityTimeout:2E3,children:{mediaLoader:{},posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{},errorDisplay:{}},language:document.getElementsByTagName("html")[0].getAttribute("lang")||navigator.languages&&navigator.languages[0]||navigator.Me||navigator.language||"en",languages:{},notSupportedMessage:"No compatible source was found for this video."};
|
||||
@ -137,7 +137,7 @@ function na(a,c,d,e,g){var h=a.Ia=a.Ia||[];g=g||{};g.kind=c;g.label=d;g.language
|
||||
t.B=t.a.extend({i:function(a,c){t.a.call(this,a,c);this.K=c.id||"vjs_"+c.kind+"_"+c.language+"_"+t.p++;this.Wc=c.src;this.Cd=c["default"]||c.dflt;this.ue=c.title;this.Ya=c.srclang;this.Sd=c.label;this.ca=[];this.vb=[];this.oa=this.qa=0;a.c("dispose",t.bind(this,this.vc,this.K))}});s=t.B.prototype;s.L=n("G");s.src=n("Wc");s.Ab=n("Cd");s.title=n("ue");s.language=n("Ya");s.label=n("Sd");s.yd=n("ca");s.rd=n("vb");s.readyState=n("qa");s.mode=n("oa");
|
||||
s.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-"+this.G+" vjs-text-track"})};s.show=function(){oa(this);this.oa=2;t.a.prototype.show.call(this)};s.Y=function(){oa(this);this.oa=1;t.a.prototype.Y.call(this)};s.disable=function(){2==this.oa&&this.Y();this.vc();this.oa=0};function oa(a){0===a.qa&&a.load();0===a.oa&&(a.d.c("timeupdate",t.bind(a,a.update,a.K)),a.d.c("ended",t.bind(a,a.reset,a.K)),("captions"===a.G||"subtitles"===a.G)&&a.d.ma("textTrackDisplay").U(a))}
|
||||
s.vc=function(){this.d.k("timeupdate",t.bind(this,this.update,this.K));this.d.k("ended",t.bind(this,this.reset,this.K));this.reset();this.d.ma("textTrackDisplay").removeChild(this)};
|
||||
s.load=function(){0===this.qa&&(this.qa=1,t.ye(this.Wc,t.bind(function(a,c,d){if(a)this.error=a,this.qa=3,this.l("error");else{var e,g;a=d.split("\n");c="";d=1;for(var h=a.length;d<h;d++)if(c=t.trim(a[d])){-1==c.indexOf("--\x3e")?(e=c,c=t.trim(a[++d])):e=this.ca.length;e={id:e,index:this.ca.length};g=c.split(/[\t ]+/);e.startTime=pa(g[0]);e.Aa=pa(g[2]);for(g=[];a[++d]&&(c=t.trim(a[d]));)g.push(c);e.text=g.join("<br/>");this.ca.push(e)}this.qa=2;this.l("loaded")}})))};
|
||||
s.load=function(){0===this.qa&&(this.qa=1,t.ye(this.Wc,t.bind(this,function(a,c,d){if(a)this.error=a,this.qa=3,this.l("error");else{var e,g;a=d.split("\n");c="";d=1;for(var h=a.length;d<h;d++)if(c=t.trim(a[d])){-1==c.indexOf("--\x3e")?(e=c,c=t.trim(a[++d])):e=this.ca.length;e={id:e,index:this.ca.length};g=c.split(/[\t ]+/);e.startTime=pa(g[0]);e.Aa=pa(g[2]);for(g=[];a[++d]&&(c=t.trim(a[d]));)g.push(c);e.text=g.join("<br/>");this.ca.push(e)}this.qa=2;this.l("loaded")}})))};
|
||||
function pa(a){var c=a.split(":");a=0;var d,e,g;3==c.length?(d=c[0],e=c[1],c=c[2]):(d=0,e=c[0],c=c[1]);c=c.split(/\s+/);c=c.splice(0,1)[0];c=c.split(/\.|,/);g=parseFloat(c[1]);c=c[0];a+=3600*parseFloat(d);a+=60*parseFloat(e);a+=parseFloat(c);g&&(a+=g/1E3);return a}
|
||||
s.update=function(){if(0<this.ca.length){var a=this.d.options().trackTimeOffset||0,a=this.d.currentTime()+a;if(this.Qb===b||a<this.Qb||this.Za<=a){var c=this.ca,d=this.d.duration(),e=0,g=l,h=[],j,p,q,w;a>=this.Za||this.Za===b?w=this.Fb!==b?this.Fb:0:(g=f,w=this.Mb!==b?this.Mb:c.length-1);for(;;){q=c[w];if(q.Aa<=a)e=Math.max(e,q.Aa),q.Qa&&(q.Qa=l);else if(a<q.startTime){if(d=Math.min(d,q.startTime),q.Qa&&(q.Qa=l),!g)break}else g?(h.splice(0,0,q),p===b&&(p=w),j=w):(h.push(q),j===b&&(j=w),p=w),d=Math.min(d,
|
||||
q.Aa),e=Math.max(e,q.startTime),q.Qa=f;if(g)if(0===w)break;else w--;else if(w===c.length-1)break;else w++}this.vb=h;this.Za=d;this.Qb=e;this.Fb=j;this.Mb=p;j=this.vb;p="";a=0;for(c=j.length;a<c;a++)p+='<span class="vjs-tt-cue">'+j[a].text+"</span>";this.b.innerHTML=p;this.l("cuechange")}}};s.reset=function(){this.Za=0;this.Qb=this.d.duration();this.Mb=this.Fb=0};t.Zb=t.B.extend();t.Zb.prototype.G="captions";t.hc=t.B.extend();t.hc.prototype.G="subtitles";t.$b=t.B.extend();t.$b.prototype.G="chapters";
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "video.js",
|
||||
"description": "An HTML5 and Flash video player with a common API and skin for both.",
|
||||
"version": "4.11.0",
|
||||
"version": "4.11.1",
|
||||
"copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
|
||||
"keywords": [
|
||||
"videojs",
|
||||
|
Loading…
Reference in New Issue
Block a user