v5.2.4 dist

CHANGELOG.md

@@ -6,6 +6,11 @@ _(none)_
 
 --------------------
 
+## 5.2.4 (2015-11-25)
+* @gesinger checked for track changes before tech started listening ([view](https://github.com/videojs/video.js/pull/2835))
+* @gesinger fixed handler explosion for cuechange events ([view](https://github.com/videojs/video.js/pull/2849))
+* @mmcc fixed vertical volume ([view](https://github.com/videojs/video.js/pull/2859))
+
 ## 5.2.3 (2015-11-24)
 * @gkatsev fixed clearing out errors ([view](https://github.com/videojs/video.js/pull/2850))
 

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": "5.2.3",
+  "version": "5.2.4",
   "keywords": [
     "videojs",
     "html5",

dist/alt/video.novtt.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.2.3 <http://videojs.com/>
+ * Video.js 5.2.4 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -14835,6 +14835,8 @@ var Tech = (function (_Component) {
    */
 
   Tech.prototype.emulateTextTracks = function emulateTextTracks() {
+    var _this = this;
+
     var tracks = this.textTracks();
     if (!tracks) {
       return;
@@ -14847,13 +14849,10 @@ var Tech = (function (_Component) {
       _globalWindow2['default']['WebVTT'] = true;
     }
 
-    var textTracksChanges = Fn.bind(this, function () {
-      var _this = this;
-
-      var updateDisplay = function updateDisplay() {
-        return _this.trigger('texttrackchange');
-      };
-
+    var updateDisplay = function updateDisplay() {
+      return _this.trigger('texttrackchange');
+    };
+    var textTracksChanges = function textTracksChanges() {
       updateDisplay();
 
       for (var i = 0; i < tracks.length; i++) {
@@ -14863,8 +14862,9 @@ var Tech = (function (_Component) {
           track.addEventListener('cuechange', updateDisplay);
         }
       }
-    });
+    };
 
+    textTracksChanges();
     tracks.addEventListener('change', textTracksChanges);
 
     this.on('dispose', function () {
@@ -18588,7 +18588,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.2.3';
+videojs.VERSION = '5.2.4';
 
 /**
  * The global options object. These are the settings that take effect

dist/video-js.css

@@ -499,7 +499,7 @@ about what's required to play video. */
   /* Same as ul background */ }
 
 /* Button Pop-up Menu */
-.vjs-menu-button-popup .vjs-menu ul {
+.vjs-menu-button-popup .vjs-menu .vjs-menu-content {
   background-color: #2B333F;
   background-color: rgba(43, 51, 63, 0.7);
   position: absolute;
@@ -911,7 +911,8 @@ width and height to zero. */
   border-top-color: transparent; }
 
 .vjs-menu-button-popup.vjs-volume-menu-button-vertical .vjs-menu {
-  left: 0.5em; }
+  left: 0.5em;
+  height: 8em; }
 
 .vjs-menu-button-popup.vjs-volume-menu-button-horizontal .vjs-menu {
   left: -2em; }

dist/video.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.2.3 <http://videojs.com/>
+ * Video.js 5.2.4 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -14839,6 +14839,8 @@ var Tech = (function (_Component) {
    */
 
   Tech.prototype.emulateTextTracks = function emulateTextTracks() {
+    var _this = this;
+
     var tracks = this.textTracks();
     if (!tracks) {
       return;
@@ -14851,13 +14853,10 @@ var Tech = (function (_Component) {
       _globalWindow2['default']['WebVTT'] = true;
     }
 
-    var textTracksChanges = Fn.bind(this, function () {
-      var _this = this;
-
-      var updateDisplay = function updateDisplay() {
-        return _this.trigger('texttrackchange');
-      };
-
+    var updateDisplay = function updateDisplay() {
+      return _this.trigger('texttrackchange');
+    };
+    var textTracksChanges = function textTracksChanges() {
       updateDisplay();
 
       for (var i = 0; i < tracks.length; i++) {
@@ -14867,8 +14866,9 @@ var Tech = (function (_Component) {
           track.addEventListener('cuechange', updateDisplay);
         }
       }
-    });
+    };
 
+    textTracksChanges();
     tracks.addEventListener('change', textTracksChanges);
 
     this.on('dispose', function () {
@@ -18592,7 +18592,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.2.3';
+videojs.VERSION = '5.2.4';
 
 /**
  * The global options object. These are the settings that take effect

package.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.2.3",
+  "version": "5.2.4",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [

src/css/components/_volume.scss

@@ -96,6 +96,7 @@ width and height to zero. */
 
 .vjs-menu-button-popup.vjs-volume-menu-button-vertical .vjs-menu {
   left: 0.5em;
+  height: 8em;
 }
 .vjs-menu-button-popup.vjs-volume-menu-button-horizontal .vjs-menu {
   left: -2em;

src/css/components/menu/_menu-popup.scss

@@ -10,7 +10,7 @@
 }
 
 /* Button Pop-up Menu */
-.vjs-menu-button-popup .vjs-menu ul {
+.vjs-menu-button-popup .vjs-menu .vjs-menu-content {
   @include background-color-with-alpha($primary-background-color, $primary-background-transparency);
 
   position: absolute;

src/js/tech/tech.js

@@ -321,9 +321,8 @@ class Tech extends Component {
       window['WebVTT'] = true;
     }
 
-    let textTracksChanges = Fn.bind(this, function() {
-      let updateDisplay = () => this.trigger('texttrackchange');
-
+    let updateDisplay = () => this.trigger('texttrackchange');
+    let textTracksChanges = () => {
       updateDisplay();
 
       for (let i = 0; i < tracks.length; i++) {
@@ -333,8 +332,9 @@ class Tech extends Component {
           track.addEventListener('cuechange', updateDisplay);
         }
       }
-    });
+    };
 
+    textTracksChanges();
     tracks.addEventListener('change', textTracksChanges);
 
     this.on('dispose', function() {

test/unit/tracks/tracks.test.js

@@ -2,6 +2,7 @@ import ChaptersButton from '../../../src/js/control-bar/text-track-controls/chap
 import SubtitlesButton from '../../../src/js/control-bar/text-track-controls/subtitles-button.js';
 import CaptionsButton from '../../../src/js/control-bar/text-track-controls/captions-button.js';
 
+import TextTrack from '../../../src/js/tracks/text-track.js';
 import TextTrackDisplay from '../../../src/js/tracks/text-track-display.js';
 import Html5 from '../../../src/js/tech/html5.js';
 import Flash from '../../../src/js/tech/flash.js';
@@ -342,3 +343,58 @@ if (Html5.supportsNativeTextTracks()) {
     emulatedTt.on('addtrack', addtrack);
   });
 }
+
+test('should check for text track changes when emulating text tracks', function() {
+  let tech = new Tech();
+  let numTextTrackChanges = 0;
+  tech.on('texttrackchange', function() {
+    numTextTrackChanges++;
+  });
+  tech.emulateTextTracks();
+  equal(numTextTrackChanges, 1, 'we got a texttrackchange event');
+});
+
+test('removes cuechange event when text track is hidden for emulated tracks', function() {
+  let player = TestHelpers.makePlayer();
+  let tt = new TextTrack({
+    tech: player.tech_,
+    mode: 'showing'
+  });
+  tt.addCue({
+    id: '1',
+    startTime: 2,
+    endTime: 5
+  });
+  player.tech_.textTracks().addTrack_(tt);
+  player.tech_.emulateTextTracks();
+
+  let numTextTrackChanges = 0;
+  player.tech_.on('texttrackchange', function() {
+    numTextTrackChanges++;
+  });
+
+  tt.mode = 'showing';
+  equal(numTextTrackChanges, 1,
+    'texttrackchange should be called once for mode change');
+  tt.mode = 'showing';
+  equal(numTextTrackChanges, 2,
+    'texttrackchange should be called once for mode change');
+
+  player.tech_.currentTime = function() {
+    return 3;
+  };
+  player.tech_.trigger('timeupdate');
+  equal(numTextTrackChanges, 3,
+    'texttrackchange should be triggered once for the cuechange');
+
+  tt.mode = 'hidden';
+  equal(numTextTrackChanges, 4,
+    'texttrackchange should be called once for the mode change');
+
+  player.tech_.currentTime = function() {
+    return 7;
+  };
+  player.tech_.trigger('timeupdate');
+  equal(numTextTrackChanges, 4,
+    'texttrackchange should be not be called since mode is hidden');
+});