1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Move backdrop transparency method to component

This commit is contained in:
Bill Thornton 2022-04-12 16:22:00 -04:00
parent 3d11cbcd8f
commit 125d5cb015
6 changed files with 54 additions and 30 deletions

View file

@ -1,6 +1,6 @@
import { appHost } from './apphost'; import { appHost } from './apphost';
import appSettings from '../scripts/settings/appSettings'; import appSettings from '../scripts/settings/appSettings';
import backdrop from './backdrop/backdrop'; import backdrop, { setBackdropTransparency } from './backdrop/backdrop';
import browser from '../scripts/browser'; import browser from '../scripts/browser';
import { Events } from 'jellyfin-apiclient'; import { Events } from 'jellyfin-apiclient';
import globalize from '../scripts/globalize'; import globalize from '../scripts/globalize';
@ -252,30 +252,14 @@ class AppRouter {
} }
} }
/**
* Sets the backdrop, background, and document transparency
* @deprecated use Dashboard.setBackdropTransparency
*/
setTransparency(level) { setTransparency(level) {
if (!this.backdropContainer) { // TODO: Remove this after JMP is updated to not use this function
this.backdropContainer = document.querySelector('.backdropContainer'); console.warn('Deprecated! Use Dashboard.setBackdropTransparency');
} setBackdropTransparency(level);
if (!this.backgroundContainer) {
this.backgroundContainer = document.querySelector('.backgroundContainer');
}
if (level === 'full' || level === 2) {
backdrop.clearBackdrop(true);
document.documentElement.classList.add('transparentDocument');
this.backgroundContainer.classList.add('backgroundContainer-transparent');
this.backdropContainer.classList.add('hide');
} else if (level === 'backdrop' || level === 1) {
backdrop.externalBackdrop(true);
document.documentElement.classList.add('transparentDocument');
this.backgroundContainer.classList.add('backgroundContainer-transparent');
this.backdropContainer.classList.add('hide');
} else {
backdrop.externalBackdrop(false);
document.documentElement.classList.remove('transparentDocument');
this.backgroundContainer.classList.remove('backgroundContainer-transparent');
this.backdropContainer.classList.remove('hide');
}
} }
getRoutes() { getRoutes() {

View file

@ -315,6 +315,41 @@ import ServerConnections from '../ServerConnections';
/* eslint-enable indent */ /* eslint-enable indent */
/**
* @enum TransparencyLevel
*/
export const TRANSPARENCY_LEVEL = {
Full: 'full',
Backdrop: 'backdrop',
None: 'none'
};
/**
* Sets the backdrop, background, and document transparency
* @param {TransparencyLevel} level The level of transparency
*/
export function setBackdropTransparency(level) {
const backdropElem = getBackdropContainer();
const backgroundElem = getBackgroundContainer();
if (level === TRANSPARENCY_LEVEL.Full || level === 2) {
clearBackdrop(true);
document.documentElement.classList.add('transparentDocument');
backgroundElem.classList.add('backgroundContainer-transparent');
backdropElem.classList.add('hide');
} else if (level === TRANSPARENCY_LEVEL.Backdrop || level === 1) {
externalBackdrop(true);
document.documentElement.classList.add('transparentDocument');
backgroundElem.classList.add('backgroundContainer-transparent');
backdropElem.classList.add('hide');
} else {
externalBackdrop(false);
document.documentElement.classList.remove('transparentDocument');
backgroundElem.classList.remove('backgroundContainer-transparent');
backdropElem.classList.remove('hide');
}
}
export default { export default {
setBackdrops: setBackdrops, setBackdrops: setBackdrops,
setBackdrop: setBackdrop, setBackdrop: setBackdrop,

View file

@ -24,6 +24,7 @@ import shell from '../../../scripts/shell';
import SubtitleSync from '../../../components/subtitlesync/subtitlesync'; import SubtitleSync from '../../../components/subtitlesync/subtitlesync';
import { appRouter } from '../../../components/appRouter'; import { appRouter } from '../../../components/appRouter';
import LibraryMenu from '../../../scripts/libraryMenu'; import LibraryMenu from '../../../scripts/libraryMenu';
import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components/backdrop/backdrop';
/* eslint-disable indent */ /* eslint-disable indent */
@ -1323,7 +1324,7 @@ import LibraryMenu from '../../../scripts/libraryMenu';
view.addEventListener('viewbeforeshow', function () { view.addEventListener('viewbeforeshow', function () {
headerElement.classList.add('osdHeader'); headerElement.classList.add('osdHeader');
appRouter.setTransparency('full'); setBackdropTransparency(TRANSPARENCY_LEVEL.Full);
}); });
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
try { try {

View file

@ -30,6 +30,7 @@ import globalize from '../../scripts/globalize';
import ServerConnections from '../../components/ServerConnections'; import ServerConnections from '../../components/ServerConnections';
import profileBuilder from '../../scripts/browserDeviceProfile'; import profileBuilder from '../../scripts/browserDeviceProfile';
import { getIncludeCorsCredentials } from '../../scripts/settings/webSettings'; import { getIncludeCorsCredentials } from '../../scripts/settings/webSettings';
import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../components/backdrop/backdrop';
/* eslint-disable indent */ /* eslint-disable indent */
@ -691,7 +692,7 @@ function tryRemoveElement(elem) {
destroyHlsPlayer(this); destroyHlsPlayer(this);
destroyFlvPlayer(this); destroyFlvPlayer(this);
appRouter.setTransparency('none'); setBackdropTransparency(TRANSPARENCY_LEVEL.None);
document.body.classList.remove('hide-scroll'); document.body.classList.remove('hide-scroll');
const videoElement = this.#mediaElement; const videoElement = this.#mediaElement;
@ -838,7 +839,7 @@ function tryRemoveElement(elem) {
if (this._currentPlayOptions.fullscreen) { if (this._currentPlayOptions.fullscreen) {
appRouter.showVideoOsd().then(this.onNavigatedToOsd); appRouter.showVideoOsd().then(this.onNavigatedToOsd);
} else { } else {
appRouter.setTransparency('backdrop'); setBackdropTransparency(TRANSPARENCY_LEVEL.Backdrop);
this.#videoDialog.classList.remove('videoPlayerContainer-onTop'); this.#videoDialog.classList.remove('videoPlayerContainer-onTop');
this.onStartedAndNavigatedToOsd(); this.onStartedAndNavigatedToOsd();

View file

@ -2,6 +2,7 @@ import { Events } from 'jellyfin-apiclient';
import browser from '../../scripts/browser'; import browser from '../../scripts/browser';
import { appRouter } from '../../components/appRouter'; import { appRouter } from '../../components/appRouter';
import loading from '../../components/loading/loading'; import loading from '../../components/loading/loading';
import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../components/backdrop/backdrop';
/* globals YT */ /* globals YT */
@ -127,7 +128,7 @@ function onPlaying(instance, playOptions, resolve) {
instance.videoDialog.classList.remove('onTop'); instance.videoDialog.classList.remove('onTop');
}); });
} else { } else {
appRouter.setTransparency('backdrop'); setBackdropTransparency(TRANSPARENCY_LEVEL.Backdrop);
instance.videoDialog.classList.remove('onTop'); instance.videoDialog.classList.remove('onTop');
} }
@ -227,7 +228,7 @@ class YoutubePlayer {
return Promise.resolve(); return Promise.resolve();
} }
destroy() { destroy() {
appRouter.setTransparency('none'); setBackdropTransparency(TRANSPARENCY_LEVEL.None);
document.body.classList.remove('hide-scroll'); document.body.classList.remove('hide-scroll');
const dlg = this.videoDialog; const dlg = this.videoDialog;

View file

@ -7,6 +7,7 @@ import baseConfirm from '../components/confirm/confirm';
import globalize from '../scripts/globalize'; import globalize from '../scripts/globalize';
import * as webSettings from '../scripts/settings/webSettings'; import * as webSettings from '../scripts/settings/webSettings';
import datetime from '../scripts/datetime'; import datetime from '../scripts/datetime';
import { setBackdropTransparency } from '../components/backdrop/backdrop';
import DirectoryBrowser from '../components/directorybrowser/directorybrowser'; import DirectoryBrowser from '../components/directorybrowser/directorybrowser';
import dialogHelper from '../components/dialogHelper/dialogHelper'; import dialogHelper from '../components/dialogHelper/dialogHelper';
import itemIdentifier from '../components/itemidentifier/itemidentifier'; import itemIdentifier from '../components/itemidentifier/itemidentifier';
@ -234,7 +235,8 @@ const Dashboard = {
datetime, datetime,
DirectoryBrowser, DirectoryBrowser,
dialogHelper, dialogHelper,
itemIdentifier itemIdentifier,
setBackdropTransparency
}; };
// This is used in plugins and templates, so keep it defined for now. // This is used in plugins and templates, so keep it defined for now.