diff options
| author | TheFrenchGhosty <47571719+TheFrenchGhosty@users.noreply.github.com> | 2021-02-25 17:54:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 17:54:28 +0100 |
| commit | 0b2109576a0730e3f5e3b8af77d1d9c50e97ae21 (patch) | |
| tree | 5bc04981db035888e1ce3facb7653e4923e45b76 | |
| parent | c8cdc50d29a7a6684314bc5e53fc328c7d3f85c3 (diff) | |
| parent | 9b79e35d5280e7c7586e44d18930267f7e5237b6 (diff) | |
| download | invidious-0b2109576a0730e3f5e3b8af77d1d9c50e97ae21.tar.gz invidious-0b2109576a0730e3f5e3b8af77d1d9c50e97ae21.tar.bz2 invidious-0b2109576a0730e3f5e3b8af77d1d9c50e97ae21.zip | |
Merge pull request #1804 from tenpura-shrimp/captionpreload
do not preload captions
| -rw-r--r-- | assets/js/player.js | 8 | ||||
| -rw-r--r-- | src/invidious/views/components/player.ecr | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/assets/js/player.js b/assets/js/player.js index 7490bd75..4db6f98d 100644 --- a/assets/js/player.js +++ b/assets/js/player.js @@ -21,6 +21,7 @@ var options = { ] }, html5: { + preloadTextTracks: false, hls: { overrideNative: true } @@ -547,3 +548,10 @@ window.addEventListener('keydown', e => { if (player.share) { player.share(shareOptions); } + +// show the preferred caption by default +if (player_data.preferred_caption_found) { + player.ready(() => { + player.textTracks()[1].mode = 'showing'; + }); +}
\ No newline at end of file diff --git a/src/invidious/views/components/player.ecr b/src/invidious/views/components/player.ecr index a898a41f..cff3e60a 100644 --- a/src/invidious/views/components/player.ecr +++ b/src/invidious/views/components/player.ecr @@ -24,9 +24,9 @@ <% end %> <% end %> - <% preferred_captions.each_with_index do |caption, i| %> + <% preferred_captions.each do |caption| %> <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("preferences").as(Preferences).locale %>" - label="<%= caption.name.simpleText %>" <% if i == 0 %>default<% end %>> + label="<%= caption.name.simpleText %>"> <% end %> <% captions.each do |caption| %> @@ -42,7 +42,8 @@ "aspect_ratio" => aspect_ratio, "title" => video.title, "description" => HTML.escape(video.short_description), - "thumbnail" => thumbnail + "thumbnail" => thumbnail, + "preferred_caption_found" => !preferred_captions.empty? }.to_pretty_json %> </script> |