From 68f3790d1b98d4d05c8ad9c7a4c1a7badfdb546f Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 13 Feb 2025 14:31:32 +0100 Subject: [PATCH 1/2] fix(withHTMLSubtitles): fallbackUrl issue --- src/withHTMLSubtitles/withHTMLSubtitles.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/withHTMLSubtitles/withHTMLSubtitles.js b/src/withHTMLSubtitles/withHTMLSubtitles.js index ffc8be3..a0b01ee 100644 --- a/src/withHTMLSubtitles/withHTMLSubtitles.js +++ b/src/withHTMLSubtitles/withHTMLSubtitles.js @@ -226,9 +226,11 @@ function withHTMLSubtitles(Video) { selectedTrackId = selectedTrack.id; delay = 0; - function getSubtitlesData(track) { - if (typeof track.url === 'string') { - return fetch(track.url) + function getSubtitlesData(track, isFallback) { + var url = isFallback ? selectedTrack.fallbackUrl : track.url; + + if (typeof url === 'string') { + return fetch(url) .then(function(resp) { if (resp.ok) { return resp.text(); @@ -252,7 +254,7 @@ function withHTMLSubtitles(Video) { } function loadSubtitles(track, isFallback) { - getSubtitlesData(track) + getSubtitlesData(track, isFallback) .then(function(text) { return subtitlesConverter.convert(text); }) From d87a83851c844c20316a3cbd9173df247d1c27b4 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 13 Feb 2025 16:06:00 +0100 Subject: [PATCH 2/2] refactor(withHTMLSubtitles): use track instead of selectedTrack for fallbackUrl --- src/withHTMLSubtitles/withHTMLSubtitles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/withHTMLSubtitles/withHTMLSubtitles.js b/src/withHTMLSubtitles/withHTMLSubtitles.js index a0b01ee..8e52a8a 100644 --- a/src/withHTMLSubtitles/withHTMLSubtitles.js +++ b/src/withHTMLSubtitles/withHTMLSubtitles.js @@ -227,7 +227,7 @@ function withHTMLSubtitles(Video) { delay = 0; function getSubtitlesData(track, isFallback) { - var url = isFallback ? selectedTrack.fallbackUrl : track.url; + var url = isFallback ? track.fallbackUrl : track.url; if (typeof url === 'string') { return fetch(url)