wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use UpNextDialog for outro segments

Browse Source
This commit is contained in:
viown
2024-10-19 20:08:27 +03:00
parent 7ad7f07b7c
commit 9b269296fe
7 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/playback/playbackmanager.js
+4 -2
View File
@@ -935,9 +935,11 @@ export class PlaybackManager {
return Promise.resolve(self._playQueueManager.getPlaylist());
};
self.promptToSkip = function (mediaSegment) {
self.promptToSkip = function (mediaSegment, player) {
player = player || self._currentPlayer;
if (mediaSegment && this._skipSegment) {
this._skipSegment.onPromptSkip(mediaSegment);
Events.trigger(player, 'promptskip', [mediaSegment]);
}
};
src/components/playback/skipsegment.ts
+10 -11
View File
@@ -56,16 +56,7 @@ class SkipSegment extends PlaybackSubscriber {
setButtonText() {
if (this.skipElement && this.currentSegment) {
if (this.player && this.currentSegment.EndTicks
&& this.currentSegment.Type === MediaSegmentType.Outro
&& this.currentSegment.EndTicks >= this.playbackManager.currentItem(this.player).RunTimeTicks
&& this.playbackManager.getNextItem()
) {
// Display "Next Episode" if it's an outro segment, exceeds or is equal to the runtime, and if there is a next track.
this.skipElement.innerHTML += globalize.translate('MediaSegmentNextEpisode');
} else {
this.skipElement.innerHTML = globalize.translate('MediaSegmentSkipPrompt', globalize.translate(`MediaSegmentType.${this.currentSegment.Type}`));
}
this.skipElement.innerHTML = globalize.translate('MediaSegmentSkipPrompt', globalize.translate(`MediaSegmentType.${this.currentSegment.Type}`));
this.skipElement.innerHTML += '<span class="material-icons skip_next" aria-hidden="true"></span>';
}
}
@@ -132,7 +123,15 @@ class SkipSegment extends PlaybackSubscriber {
}
}
onPromptSkip(segment: MediaSegmentDto) {
onPromptSkip(e: Event, segment: MediaSegmentDto) {
if (this.player && segment.EndTicks != null
&& segment.Type === MediaSegmentType.Outro
&& segment.EndTicks >= this.playbackManager.currentItem(this.player).RunTimeTicks
&& this.playbackManager.getNextItem()
) {
// Don't display button when UpNextDialog is expected.
return;
}
if (!this.currentSegment) {
this.currentSegment = segment;