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 branch 'jellyfin:master' into upd-prev-track-evt

Browse source
This commit is contained in:
Sky High 2023-04-17 09:15:40 +02:00 • committed by GitHub
commit 4b9a7ba00b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 1102 additions and 979 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/upnextdialog/upnextdialog.js
View file

@ -69,9 +69,9 @@ import '../../styles/flexstyles.scss';
const elem = instance.options.parent;
elem.querySelector('.upNextDialog-mediainfo').innerHTML = mediaInfo.getPrimaryMediaInfoHtml(item, {
criticRating: false,
criticRating: true,
originalAirDate: false,
starRating: false,
starRating: true,
subtitles: false
});

19
src/components/viewContainer.js
View file

@ -2,6 +2,14 @@ import { importModule } from '@uupaa/dynamic-import-polyfill';
import './viewManager/viewContainer.scss';
import Dashboard from '../utils/dashboard';
const getMainAnimatedPages = () => {
if (!mainAnimatedPages) {
mainAnimatedPages = document.querySelector('.mainAnimatedPages');
}
return mainAnimatedPages;
};
/* eslint-disable indent */
function setControllerClass(view, options) {
@ -55,6 +63,11 @@ import Dashboard from '../utils/dashboard';
view.classList.add('mainAnimatedPage');
if (!getMainAnimatedPages()) {
console.warn('[viewContainer] main animated pages element is not present');
return;
}
if (currentPage) {
if (newViewInfo.hasScript && window.$) {
mainAnimatedPages.removeChild(currentPage);
@ -225,18 +238,18 @@ import Dashboard from '../utils/dashboard';
export function reset() {
allPages = [];
currentUrls = [];
mainAnimatedPages.innerHTML = '';
if (mainAnimatedPages) mainAnimatedPages.innerHTML = '';
selectedPageIndex = -1;
}
let onBeforeChange;
const mainAnimatedPages = document.querySelector('.mainAnimatedPages');
let mainAnimatedPages;
let allPages = [];
let currentUrls = [];
const pageContainerCount = 3;
let selectedPageIndex = -1;
reset();
mainAnimatedPages.classList.remove('hide');
getMainAnimatedPages()?.classList.remove('hide');
/* eslint-enable indent */