fix(captions): Fixed workflow to prepare captions correctly by removi…

…ng assignment of current caption to the first one
openplayerjs · Dec 10, 2019 · a6aa9bf · a6aa9bf
1 parent e62163b
commit a6aa9bf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/dist/openplayer.js b/dist/openplayer.js
@@ -5352,25 +5352,23 @@ var Captions = function () {
     value: function _prepareTrack(index, language, trackUrl) {
       var _this2 = this;
 
-      var defaultTrack = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+      var showTrack = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       this.trackUrlList[language] = trackUrl;
       this.trackList[index].mode = 'disabled';
 
-      if (defaultTrack) {
+      if (showTrack) {
         this["default"] = language;
         this.button.classList.add('op-controls__captions--on');
         this.button.setAttribute('data-active-captions', language);
         this.current = Array.from(this.trackList).filter(function (item) {
           return item.language === _this2["default"];
         }).pop();
-      } else {
-        this.current = this.trackList[0];
-      }
 
-      this._show();
+        this._show();
 
-      if (!this.player.getContainer().classList.contains('op-captions--detected')) {
-        this.player.getContainer().classList.add('op-captions--detected');
+        if (!this.player.getContainer().classList.contains('op-captions--detected')) {
+          this.player.getContainer().classList.add('op-captions--detected');
+        }
       }
     }
   }, {

diff --git a/dist/openplayer.min.js b/dist/openplayer.min.js
diff --git a/src/js/controls/captions.ts b/src/js/controls/captions.ts
@@ -646,24 +646,22 @@ class Captions implements PlayerComponent {
      * @param {number} index
      * @param {string} language
      * @param {string} trackUrl
-     * @param {boolean} [defaultTrack=false]
+     * @param {boolean} [showTrack=false]
      * @memberof Captions
      */
-    private _prepareTrack(index: number, language: string, trackUrl: string, defaultTrack: boolean = false) {
+    private _prepareTrack(index: number, language: string, trackUrl: string, showTrack: boolean = false) {
         this.trackUrlList[language] = trackUrl;
         this.trackList[index].mode = 'disabled';
-        if (defaultTrack) {
+        if (showTrack) {
             this.default = language;
             this.button.classList.add('op-controls__captions--on');
             this.button.setAttribute('data-active-captions', language);
             this.current = Array.from(this.trackList)
                 .filter(item => item.language === this.default).pop();
-        } else {
-            this.current = this.trackList[0];
-        }
-        this._show();
-        if (!this.player.getContainer().classList.contains('op-captions--detected')) {
-            this.player.getContainer().classList.add('op-captions--detected');
+            this._show();
+            if (!this.player.getContainer().classList.contains('op-captions--detected')) {
+                this.player.getContainer().classList.add('op-captions--detected');
+            }
         }
     }