From a9400ab0e3f5bfadc92f6f284bbef2e7b341004f Mon Sep 17 00:00:00 2001 From: JonathanTGold <62672270+JonathanTGold@users.noreply.github.com> Date: Wed, 21 Dec 2022 17:31:24 +0200 Subject: [PATCH] fix(FEC-12760): Blank Transcript Box In V7 Player (#682) solves FEC-12760 related pr: kaltura/playkit-js-hls#183 kaltura/playkit-js-dash#219 --- src/player.js | 13 +++++++------ src/track/text-track.js | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/player.js b/src/player.js index d0ffffe9f..0440b257c 100644 --- a/src/player.js +++ b/src/player.js @@ -2625,18 +2625,19 @@ export default class Player extends FakeEventTarget { * @returns {string} - The track language to set by default. */ _getLanguage(tracks: Array, configuredLanguage: string, defaultTrack: ?T): string { - let language = configuredLanguage; - if (language === AUTO) { + let autoSelectedLanguage: string = ''; + const defaultStreamTrack: string = tracks.find(track => track.default)?.language || ''; + if (configuredLanguage === AUTO) { const localeTrack: ?T = tracks.find(track => Track.langComparer(Locale.language, track.language)); if (localeTrack) { - language = localeTrack.language; + autoSelectedLanguage = localeTrack.language; } else if (defaultTrack && defaultTrack.language !== OFF) { - language = defaultTrack.language; + autoSelectedLanguage = defaultTrack.language; } else if (tracks && tracks.length > 0) { - language = tracks[0].language; + autoSelectedLanguage = tracks[0].language; } } - return language; + return autoSelectedLanguage || configuredLanguage || defaultStreamTrack; } /** diff --git a/src/track/text-track.js b/src/track/text-track.js index ba350d52b..cb678029e 100644 --- a/src/track/text-track.js +++ b/src/track/text-track.js @@ -99,7 +99,7 @@ const TextTrack: TextTrack = class TextTrack extends Track { this._kind = settings.kind; this._external = settings.external; this._index = TextTrack._generateIndex(); - this._default = this.active; + this._default = settings.default || false; } };