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

Backport pull request #6266 from jellyfin-web/release-10.10.z

Browse source 
Make ask to skip the default for 'Intro' and 'Outro' segments

Original-merge: 7ccc494a5b

Merged-by: thornbill <thornbill@users.noreply.github.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
viown 2024-11-03 10:54:31 -05:00 • committed by Joshua M. Boniface
parent 0ff58e81b0
commit 1bbae0ef23
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
View file

@ -5,10 +5,16 @@ import { UserSettings } from 'scripts/settings/userSettings';
import { MediaSegmentAction } from '../constants/mediaSegmentAction';
const PREFIX = 'segmentTypeAction';
const DEFAULT_ACTIONS: Partial<Record<MediaSegmentType, MediaSegmentAction>> = {
[MediaSegmentType.Intro]: MediaSegmentAction.AskToSkip,
[MediaSegmentType.Outro]: MediaSegmentAction.AskToSkip
};
export const getId = (type: MediaSegmentType) => `${PREFIX}__${type}`;
export function getMediaSegmentAction(userSettings: UserSettings, type: MediaSegmentType): MediaSegmentAction | undefined {
export function getMediaSegmentAction(userSettings: UserSettings, type: MediaSegmentType): MediaSegmentAction {
const action = userSettings.get(getId(type), false);
return action ? action as MediaSegmentAction : undefined;
const defaultAction = DEFAULT_ACTIONS[type] || MediaSegmentAction.None;
return action ? action as MediaSegmentAction : defaultAction;
}

2
src/components/playbackSettings/playbackSettings.js
View file

@ -65,7 +65,7 @@ function populateMediaSegments(container, userSettings) {
].map(segmentType => {
const segmentTypeLabel = globalize.translate('LabelMediaSegmentsType', globalize.translate(`MediaSegmentType.${segmentType}`));
const id = getId(segmentType);
selectedValues[id] = getMediaSegmentAction(userSettings, segmentType) || MediaSegmentAction.None;
selectedValues[id] = getMediaSegmentAction(userSettings, segmentType);
return `<div class="selectContainer">
<select is="emby-select" id="${id}" class="segmentTypeAction" label="${segmentTypeLabel}">
${actionOptions}