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

Fix chapter marker re-rendering #5593

Merged
merged 1 commit into from
May 23, 2024

Conversation

thornbill
Copy link
Member

Changes

  • Prevents the marker html from being constantly re-rendered if markerInfo is already populated
  • Fixes a small style regression from Fix chapter name XSS injection in progress bar #5563 due to the size being dependent on the font-size set by the material-icons class

Issues
I can't find one, but I saw the chapter markers flashing being reported somewhere...

@thornbill thornbill added bug Something isn't working stable backport Backport into the next stable release labels May 23, 2024
@thornbill thornbill added this to the v10.9.3 milestone May 23, 2024
@thornbill thornbill requested a review from a team as a code owner May 23, 2024 18:44
Copy link

sonarcloud bot commented May 23, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@thornbill thornbill merged commit bd03c43 into jellyfin:release-10.9.z May 23, 2024
10 checks passed
@@ -203,14 +203,14 @@ function setMarker(range, valueMarker, marker, valueProgress) {
}

function updateMarkers(range, currentValue) {
if (range.getMarkerInfo) {
if (range.getMarkerInfo && !range.markerInfo) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't markerInfo (as well as the slider itself) preserved when start playing the next video, so the markers won't be updated?

Copy link
Member Author

Choose a reason for hiding this comment

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

In my testing it was not.

Copy link
Contributor

Choose a reason for hiding this comment

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

I only get to the breakpoint once per refresh. So I assume they are preserved (because videoosd doesn't reload for the next item).

Copy link
Member Author

Choose a reason for hiding this comment

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

hmm yeah you are right... I'm not sure how it worked when I originally tested... #5601

@thornbill thornbill deleted the fix-chapter-markers branch May 24, 2024 02:54
joshuaboniface pushed a commit that referenced this pull request May 25, 2024
Fix chapter marker re-rendering

Original-merge: bd03c43

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 May 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants