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

Use object to return multiple info instead of array.

Browse source
This commit is contained in:
Viperinius 2022-07-05 16:31:48 +02:00
parent b78d6439b0
commit ba2c365ac9
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/controllers/playback/video/index.js
View file

@ -1577,25 +1577,26 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
nowPlayingPositionSlider.getChapterNamesAndFractions = function () { nowPlayingPositionSlider.getChapterNamesAndFractions = function () {
showOsd(); showOsd();
const markers = [];
const item = currentItem; const item = currentItem;
if (item && item.Chapters && item.Chapters.length) { if (item && item.Chapters && item.Chapters.length) {
const chapterNames = [];
const chapterFractions = [];
const runtimeDuration = item.RunTimeTicks; const runtimeDuration = item.RunTimeTicks;
for (let i = 0, length = item.Chapters.length; i < length; i++) { for (let i = 0, length = item.Chapters.length; i < length; i++) {
const currentChapter = item.Chapters[i]; const currentChapter = item.Chapters[i];
const fraction = currentChapter.StartPositionTicks / runtimeDuration; const fraction = currentChapter.StartPositionTicks / runtimeDuration;
chapterFractions.push(fraction);
chapterNames.push(currentChapter.Name);
}
return [chapterNames, chapterFractions]; markers.push({
name: currentChapter.Name,
progress: fraction
});
}
} }
return [[], []]; return markers;
}; };
view.querySelector('.btnPreviousTrack').addEventListener('click', function () { view.querySelector('.btnPreviousTrack').addEventListener('click', function () {

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

@ -163,20 +163,19 @@ import '../emby-input/emby-input';
} }
function updateChapterMarks(range, currentValue) { function updateChapterMarks(range, currentValue) {
if (range.chapterFractions && range.chapterFractions.length && range.chapterMarkElements && range.chapterMarkElements.length) { if (range.chapterInfo && range.chapterInfo.length && range.chapterMarkElements && range.chapterMarkElements.length) {
for (let i = 0, length = range.chapterMarkElements.length; i < length; i++) { for (let i = 0, length = range.chapterMarkElements.length; i < length; i++) {
if (range.chapterFractions.length > i) { if (range.chapterInfo.length > i) {
setChapterMark(range, mapFractionToValue(range, range.chapterFractions[i]), range.chapterMarkElements[i], currentValue); setChapterMark(range, mapFractionToValue(range, range.chapterInfo[i].progress), range.chapterMarkElements[i], currentValue);
} }
} }
} }
} }
function addChapterMarks(range) { function addChapterMarks(range) {
range.chapterNames = []; range.chapterInfo = [];
range.chapterFractions = [];
if (range.getChapterNamesAndFractions) { if (range.getChapterNamesAndFractions) {
[range.chapterNames, range.chapterFractions] = range.getChapterNamesAndFractions(); range.chapterInfo = range.getChapterNamesAndFractions();
} }
function htmlToInsert(chapterName) { function htmlToInsert(chapterName) {
@ -188,8 +187,8 @@ import '../emby-input/emby-input';
return `<span class="material-icons sliderChapterMark ${classChapterName}" aria-hidden="true"></span>`; return `<span class="material-icons sliderChapterMark ${classChapterName}" aria-hidden="true"></span>`;
} }
range.chapterNames.forEach(chapterName => { range.chapterInfo.forEach(chapter => {
range.chapterMarkContainerElement.insertAdjacentHTML('beforeend', htmlToInsert(chapterName || '')); range.chapterMarkContainerElement.insertAdjacentHTML('beforeend', htmlToInsert(chapter.name || ''));
}); });
range.chapterMarkElements = range.chapterMarkContainerElement.querySelectorAll('.sliderChapterMark'); range.chapterMarkElements = range.chapterMarkContainerElement.querySelectorAll('.sliderChapterMark');