diff --git a/src/components/appRouter.js b/src/components/appRouter.js index 30553ea9b..b834f1e83 100644 --- a/src/components/appRouter.js +++ b/src/components/appRouter.js @@ -1,6 +1,6 @@ import { appHost } from './apphost'; import appSettings from '../scripts/settings/appSettings'; -import backdrop, { setBackdropTransparency } from './backdrop/backdrop'; +import { clearBackdrop, setBackdropTransparency } from './backdrop/backdrop'; import browser from '../scripts/browser'; import { Events } from 'jellyfin-apiclient'; import globalize from '../scripts/globalize'; @@ -106,7 +106,7 @@ class AppRouter { } beginConnectionWizard() { - backdrop.clearBackdrop(); + clearBackdrop(); loading.show(); ServerConnections.connect({ enableAutoLogin: appSettings.enableAutoLogin() diff --git a/src/components/backdrop/backdrop.js b/src/components/backdrop/backdrop.js index c27f03aae..0c84defc8 100644 --- a/src/components/backdrop/backdrop.js +++ b/src/components/backdrop/backdrop.js @@ -349,10 +349,3 @@ export function setBackdropTransparency(level) { backdropElem.classList.remove('hide'); } } - -export default { - setBackdrops: setBackdrops, - setBackdrop: setBackdrop, - clearBackdrop: clearBackdrop, - externalBackdrop: externalBackdrop -}; diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 53b61949e..fdb15b272 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -1,6 +1,6 @@ import escapeHtml from 'escape-html'; import datetime from '../../scripts/datetime'; -import backdrop from '../backdrop/backdrop'; +import { clearBackdrop, setBackdrops } from '../backdrop/backdrop'; import listView from '../listview/listview'; import imageLoader from '../images/imageLoader'; import { playbackManager } from '../playback/playbackmanager'; @@ -229,7 +229,7 @@ function updateNowPlayingInfo(context, state, serverId) { }); }); setImageUrl(context, state, url); - backdrop.setBackdrops([item]); + setBackdrops([item]); apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) { const userData = fullItem.UserData || {}; const likes = userData.Likes == null ? '' : userData.Likes; @@ -237,7 +237,7 @@ function updateNowPlayingInfo(context, state, serverId) { context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = ''; }); } else { - backdrop.clearBackdrop(); + clearBackdrop(); context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = ''; } } diff --git a/src/components/tabbedview/tabbedview.js b/src/components/tabbedview/tabbedview.js index b5c54d41b..46b14ed36 100644 --- a/src/components/tabbedview/tabbedview.js +++ b/src/components/tabbedview/tabbedview.js @@ -1,4 +1,4 @@ -import backdrop from '../backdrop/backdrop'; +import { clearBackdrop } from '../backdrop/backdrop'; import * as mainTabsManager from '../maintabsmanager'; import layoutManager from '../layoutManager'; import '../../elements/emby-tabs/emby-tabs'; @@ -87,7 +87,7 @@ class TabbedView { onResume() { this.setTitle(); - backdrop.clearBackdrop(); + clearBackdrop(); const currentTabController = this.currentTabController; diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js index 3f9448d5a..f814418be 100644 --- a/src/controllers/itemDetails/index.js +++ b/src/controllers/itemDetails/index.js @@ -10,7 +10,7 @@ import * as userSettings from '../../scripts/settings/userSettings'; import cardBuilder from '../../components/cardbuilder/cardBuilder'; import datetime from '../../scripts/datetime'; import mediaInfo from '../../components/mediainfo/mediainfo'; -import backdrop from '../../components/backdrop/backdrop'; +import { clearBackdrop, setBackdrops } from '../../components/backdrop/backdrop'; import listView from '../../components/listview/listview'; import itemContextMenu from '../../components/itemContextMenu'; import itemHelper from '../../components/itemHelper'; @@ -514,9 +514,9 @@ function setTrailerButtonVisibility(page, item) { function renderBackdrop(item) { if (dom.getWindowSize().innerWidth >= 1000) { - backdrop.setBackdrops([item]); + setBackdrops([item]); } else { - backdrop.clearBackdrop(); + clearBackdrop(); } } diff --git a/src/scripts/autoBackdrops.js b/src/scripts/autoBackdrops.js index 02e73ff3d..2334d1690 100644 --- a/src/scripts/autoBackdrops.js +++ b/src/scripts/autoBackdrops.js @@ -1,4 +1,4 @@ -import backdrop from '../components/backdrop/backdrop'; +import { clearBackdrop, setBackdrops } from '../components/backdrop/backdrop'; import * as userSettings from './settings/userSettings'; import libraryMenu from './libraryMenu'; import { pageClassOn } from '../utils/dashboard'; @@ -48,12 +48,12 @@ function showBackdrop(type, parentId) { if (apiClient) { getBackdropItemIds(apiClient, apiClient.getCurrentUserId(), type, parentId).then(function (images) { if (images.length) { - backdrop.setBackdrops(images.map(function (i) { + setBackdrops(images.map(function (i) { i.BackdropImageTags = [i.tag]; return i; })); } else { - backdrop.clearBackdrop(); + clearBackdrop(); } }); } @@ -70,10 +70,10 @@ pageClassOn('pageshow', 'page', function () { showBackdrop(type, parentId); } else { page.classList.remove('backdropPage'); - backdrop.clearBackdrop(); + clearBackdrop(); } } else { - backdrop.clearBackdrop(); + clearBackdrop(); } } });