Skip to content
This repository has been archived by the owner on Jan 17, 2020. It is now read-only.

Commit

Permalink
Update VideoJS to 4.12.5
Browse files Browse the repository at this point in the history
  • Loading branch information
philipgiuliani committed Apr 13, 2015
1 parent 5cc5907 commit 6fdb95d
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 73 deletions.
Binary file modified demo/font/vjs.eot
100644 → 100755
Binary file not shown.
83 changes: 23 additions & 60 deletions demo/font/vjs.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/font/vjs.ttf
100644 → 100755
Binary file not shown.
Binary file modified demo/font/vjs.woff
100644 → 100755
Binary file not shown.
2 changes: 1 addition & 1 deletion demo/video-js.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
Video.js Default Styles (http://videojs.com)
Version 4.12.0
Version 4.12.4
Create your own skin at http://designer.videojs.com
*/
/* SKIN
Expand Down
31 changes: 19 additions & 12 deletions demo/video.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'ht
* Full player version
* @type {string}
*/
vjs['VERSION'] = '4.12.0';
vjs['VERSION'] = '4.12.4';

/**
* Global Player instance options, surfaced from vjs.Player.prototype.options_
Expand Down Expand Up @@ -6878,13 +6878,13 @@ vjs.MediaTechController.prototype.emulateTextTracks = function() {
vjs.MediaTechController.prototype.textTracks_;

vjs.MediaTechController.prototype.textTracks = function() {
this.textTracks_ = this.textTracks_ || new vjs.TextTrackList();
return this.textTracks_;
this.player_.textTracks_ = this.player_.textTracks_ || new vjs.TextTrackList();
return this.player_.textTracks_;
};

vjs.MediaTechController.prototype.remoteTextTracks = function() {
this.remoteTextTracks_ = this.remoteTextTracks_ || new vjs.TextTrackList();
return this.remoteTextTracks_;
this.player_.remoteTextTracks_ = this.player_.remoteTextTracks_ || new vjs.TextTrackList();
return this.player_.remoteTextTracks_;
};

createTrackHelper = function(self, kind, label, language, options) {
Expand Down Expand Up @@ -7029,6 +7029,16 @@ vjs.MediaTechController.withSourceHandlers = function(Tech){
Tech.prototype.setSource = function(source){
var sh = Tech.selectSourceHandler(source);

if (!sh) {
// Fall back to a native source hander when unsupported sources are
// deliberately set
if (Tech.nativeSourceHandler) {
sh = Tech.nativeSourceHandler;
} else {
vjs.log.error('No source hander found for the current source.');
}
}

// Dispose any existing source handler
this.disposeSourceHandler();
this.off('dispose', this.disposeSourceHandler);
Expand Down Expand Up @@ -7223,7 +7233,7 @@ vjs.Html5.prototype.createEl = function(){


vjs.Html5.prototype.hideCaptions = function() {
var tracks = this.el_.textTracks,
var tracks = this.el_.querySelectorAll('track'),
track,
i = tracks.length,
kinds = {
Expand All @@ -7232,8 +7242,9 @@ vjs.Html5.prototype.hideCaptions = function() {
};

while (i--) {
track = tracks[i];
if (track && track['kind'] in kinds) {
track = tracks[i].track;
if ((track && track['kind'] in kinds) &&
(!tracks[i]['default'])) {
track.mode = 'disabled';
}
}
Expand Down Expand Up @@ -9560,10 +9571,6 @@ vjs.ChaptersTrackMenuItem.prototype.update = function(){
}
}

if (target.selectedOptions) {
target.selectedOptions[0] = option;
}

target.selectedIndex = i;
}

Expand Down

0 comments on commit 6fdb95d

Please sign in to comment.