1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

fix: only show secondary if primary sill valid, remove resolveOnClick

This commit is contained in:
Ivan Schurawel 2022-10-09 22:33:08 -04:00 committed by Ivan Schurawel
parent e01124cbca
commit f33699ad8a
2 changed files with 32 additions and 10 deletions

View file

@ -1062,8 +1062,21 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
return opt;
});
// Only show option if: player has support, has more than 1 subtitle track, has valid secondary tracks, primary subtitle is not off
if (playbackManager.hasSecondarySubtitleSupport(player) && streams.length > 1 && secondaryStreams.length > 0 && currentIndex !== -1) {
/**
* Only show option if:
* - player has support
* - has more than 1 subtitle track
* - has valid secondary tracks
* - primary subtitle is not off
* - primary subtitle is `External`
*/
if (
playbackManager.hasSecondarySubtitleSupport(player) &&
streams.length > 1 &&
secondaryStreams.length > 0 &&
currentIndex !== -1 &&
playbackManager.isSubtitleStreamExternal(currentIndex, player)
) {
const secondarySubtitleMenuItem = {
name: globalize.translate('SecondarySubtitles'),
id: 'secondarysubtitle'
@ -1077,7 +1090,6 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
actionsheet.show({
title: globalize.translate('Subtitles'),
items: menuItems,
resolveOnClick: true,
positionTo: positionTo
}).then(function (id) {
if (id === 'secondarysubtitle') {