web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-04-13 11:50:49 +02:00
Code Releases Activity

@gkatsev removed non-default track auto-disabling. closes #2468

Browse Source
This commit is contained in:
Gary Katsevman 2015-08-21 11:19:55 -04:00
parent c03e26c575
commit a02f0befbc
2 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,7 +2,7 @@ CHANGELOG
========= =========
## HEAD (Unreleased) ## HEAD (Unreleased)
_(none)_ * @gkatsev removed non-default track auto-disabling ([view](https://github.com/videojs/video.js/pull/2468))
-------------------- --------------------

42
src/js/media/html5.js
View File

@ -59,10 +59,6 @@ vjs.Html5 = vjs.MediaTechController.extend({
} }
} }
if (this['featuresNativeTextTracks']) {
this.on('loadstart', vjs.bind(this, this.hideCaptions));
}
// Determine if native controls should be used // Determine if native controls should be used
// Our goal should be to get the custom controls on mobile solid everywhere // Our goal should be to get the custom controls on mobile solid everywhere
// so we can remove this all together. Right now this will block custom // so we can remove this all together. Right now this will block custom
@ -165,25 +161,6 @@ vjs.Html5.prototype.createEl = function(){
// jenniisawesome = true; // jenniisawesome = true;
}; };
vjs.Html5.prototype.hideCaptions = function() {
var tracks = this.el_.querySelectorAll('track'),
track,
i = tracks.length,
kinds = {
'captions': 1,
'subtitles': 1
};
while (i--) {
track = tracks[i].track;
if ((track && track['kind'] in kinds) &&
(!tracks[i]['default'])) {
track.mode = 'disabled';
}
}
};
// Make video events trigger player events // Make video events trigger player events
// May seem verbose here, but makes other APIs possible. // May seem verbose here, but makes other APIs possible.
// Triggers removed using this.off when disposed // Triggers removed using this.off when disposed
@ -426,25 +403,6 @@ vjs.Html5.prototype.addRemoteTextTrack = function(options) {
} }
this.el().appendChild(track); this.el().appendChild(track);
if (track.track['kind'] === 'metadata') {
track['track']['mode'] = 'hidden';
} else {
track['track']['mode'] = 'disabled';
}
track['onload'] = function() {
var tt = track['track'];
if (track.readyState >= 2) {
if (tt['kind'] === 'metadata' && tt['mode'] !== 'hidden') {
tt['mode'] = 'hidden';
} else if (tt['kind'] !== 'metadata' && tt['mode'] !== 'disabled') {
tt['mode'] = 'disabled';
}
track['onload'] = null;
}
};
this.remoteTextTracks().addTrack_(track.track); this.remoteTextTracks().addTrack_(track.track);
return track; return track;