Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show Skip Button When 'Next Video Info Overlay' is Disabled #6258

Merged
merged 4 commits into from
Oct 30, 2024

Conversation

rlauuzo
Copy link
Contributor

@rlauuzo rlauuzo commented Oct 26, 2024

Adjusts the behavior of the skip button based on the 'Next Video Info Overlay' setting. When the overlay option is enabled, the up-next info box is displayed as expected. However, if the setting is disabled, the regular segment skip button will be shown instead, allowing for a more consistent experience based on user preference.

@rlauuzo rlauuzo requested a review from a team as a code owner October 26, 2024 16:35
@jellyfin-bot
Copy link
Collaborator

jellyfin-bot commented Oct 26, 2024

Cloudflare Pages deployment

Latest commit 7c6a349
Status ✅ Deployed!
Preview URL https://100b086b.jellyfin-web.pages.dev
Type 🔀 Preview

View build logs

@thornbill thornbill changed the base branch from master to release-10.10.z October 28, 2024 14:17
@thornbill thornbill added enhancement Improve existing functionality or small fixes stable backport Backport into the next stable release labels Oct 28, 2024
@thornbill thornbill added this to the v10.10.1 milestone Oct 28, 2024
Copy link
Member

@thornbill thornbill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! I only had a minor suggestion to keep formatting consistent.

src/components/playback/skipsegment.ts Outdated Show resolved Hide resolved
src/controllers/playback/video/index.js Outdated Show resolved Hide resolved
rlauuzo and others added 2 commits October 28, 2024 18:07
Co-authored-by: Bill Thornton <thornbill@users.noreply.github.com>
Co-authored-by: Bill Thornton <thornbill@users.noreply.github.com>
Copy link

sonarcloud bot commented Oct 28, 2024

@thornbill thornbill merged commit 3311a14 into jellyfin:release-10.10.z Oct 30, 2024
14 checks passed
joshuaboniface pushed a commit that referenced this pull request Nov 3, 2024
Show Skip Button When 'Next Video Info Overlay' is Disabled

Original-merge: 3311a14

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

Backported-by: Joshua M. Boniface <joshua@boniface.me>
@jellyfin-bot jellyfin-bot removed the stable backport Backport into the next stable release label Nov 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Improve existing functionality or small fixes
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants