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

Merge pull request #5519 from Schoggi0815/release-10.9.z

Browse source 
Fix chapter markings not displayed properly
This commit is contained in:
Bill Thornton 2024-05-16 17:12:50 -04:00 • committed by GitHub
commit b17ca028f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/elements/emby-slider/emby-slider.js
View file

@ -138,9 +138,6 @@ function updateValues(isValueSet) {
} }
if (range.markerContainerElement) { if (range.markerContainerElement) {
if (!range.triedAddingMarkers) {
addMarkers(range);
}
updateMarkers(range, value); updateMarkers(range, value);
} }
}); });
@ -206,21 +203,6 @@ function setMarker(range, valueMarker, marker, valueProgress) {
} }
function updateMarkers(range, currentValue) { function updateMarkers(range, currentValue) {
if (range.markerInfo?.length && range.markerElements?.length) {
for (let i = 0, length = range.markerElements.length; i < length; i++) {
if (range.markerInfo.length > i) {
setMarker(range, mapFractionToValue(range, range.markerInfo[i].progress), range.markerElements[i], currentValue);
}
}
}
}
function addMarkers(range) {
range.markerInfo = [];
if (range.getMarkerInfo) {
range.markerInfo = range.getMarkerInfo();
}
function getMarkerHtml(markerInfo) { function getMarkerHtml(markerInfo) {
let markerTypeSpecificClasses = ''; let markerTypeSpecificClasses = '';
@ -236,12 +218,25 @@ function addMarkers(range) {
return `<span class="material-icons sliderMarker ${markerTypeSpecificClasses}" aria-hidden="true"></span>`; return `<span class="material-icons sliderMarker ${markerTypeSpecificClasses}" aria-hidden="true"></span>`;
} }
range.markerInfo.forEach(info => { if (range.getMarkerInfo) {
range.markerContainerElement.insertAdjacentHTML('beforeend', getMarkerHtml(info)); range.markerInfo = range.getMarkerInfo();
});
range.markerElements = range.markerContainerElement.querySelectorAll('.sliderMarker'); range.markerContainerElement.innerHTML = '';
range.triedAddingMarkers = true;
range.markerInfo.forEach(info => {
range.markerContainerElement.insertAdjacentHTML('beforeend', getMarkerHtml(info));
});
range.markerElements = range.markerContainerElement.querySelectorAll('.sliderMarker');
}
if (range.markerInfo?.length && range.markerElements?.length) {
for (let i = 0, length = range.markerElements.length; i < length; i++) {
if (range.markerInfo.length > i) {
setMarker(range, mapFractionToValue(range, range.markerInfo[i].progress), range.markerElements[i], currentValue);
}
}
}
} }
EmbySliderPrototype.attachedCallback = function () { EmbySliderPrototype.attachedCallback = function () {