Release v4.12.14

CHANGELOG.md

@@ -2,10 +2,13 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
-* @gkatsev removed non-default track auto-disabling ([view](https://github.com/videojs/video.js/pull/2468))
+_(none)_
 
 --------------------
 
+## 4.12.14 (2015-08-21)
+* @gkatsev removed non-default track auto-disabling ([view](https://github.com/videojs/video.js/pull/2468))
+
 ## 4.12.13 (2015-08-10)
 * @dmlap update to videojs-swf v4.7.3 ([view](https://github.com/videojs/video.js/pull/2457))
 

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.12.13",
+  "version": "4.12.14",
   "main": [
     "dist/video-js/video.js",
     "dist/video-js/video-js.css",

component.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.12.13",
+  "version": "4.12.14",
   "keywords": [
     "videojs",
     "html5",

dist/video-js/video-js.css

@@ -1,6 +1,6 @@
 /*!
 Video.js Default Styles (http://videojs.com)
-Version 4.12.13
+Version 4.12.14
 Create your own skin at http://designer.videojs.com
 */
 /* SKIN

dist/video-js/video.dev.js

@@ -80,7 +80,7 @@ vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'ht
 * Full player version
 * @type {string}
 */
-vjs['VERSION'] = '4.12.13';
+vjs['VERSION'] = '4.12.14';
 
 /**
  * Global Player instance options, surfaced from vjs.Player.prototype.options_
@@ -7145,10 +7145,6 @@ vjs.Html5 = vjs.MediaTechController.extend({
       }
     }
 
-    if (this['featuresNativeTextTracks']) {
-      this.on('loadstart', vjs.bind(this, this.hideCaptions));
-    }
-
     // Determine if native controls should be used
     // 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
@@ -7251,25 +7247,6 @@ vjs.Html5.prototype.createEl = function(){
   // 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
 // May seem verbose here, but makes other APIs possible.
 // Triggers removed using this.off when disposed
@@ -7512,25 +7489,6 @@ vjs.Html5.prototype.addRemoteTextTrack = function(options) {
   }
 
   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);
 
   return track;