cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3538 from thornbill/move-screensaver-manager

Browse Source
This commit is contained in:
Bill Thornton 2022-04-01 08:48:29 -04:00 committed by GitHub
commit 5a9bf5a05c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libraries/screensavermanager.js → src/scripts/screensavermanager.js
View File

@ -1,8 +1,8 @@
import { Events } from 'jellyfin-apiclient'; import { Events } from 'jellyfin-apiclient';
import { playbackManager } from '../components/playback/playbackmanager'; import { playbackManager } from '../components/playback/playbackmanager';
import { pluginManager } from '../components/pluginManager'; import { pluginManager } from '../components/pluginManager';
import inputManager from '../scripts/inputManager'; import inputManager from './inputManager';
import * as userSettings from '../scripts/settings/userSettings'; import * as userSettings from './settings/userSettings';
import ServerConnections from '../components/ServerConnections'; import ServerConnections from '../components/ServerConnections';
import './screensavermanager.scss'; import './screensavermanager.scss';
@ -18,7 +18,7 @@ function getFunctionalEventIdleTime() {
return new Date().getTime() - lastFunctionalEvent; return new Date().getTime() - lastFunctionalEvent;
} }
Events.on(playbackManager, 'playbackstop', function (e, stopInfo) { Events.on(playbackManager, 'playbackstop', function (_e, stopInfo) {
const state = stopInfo.state; const state = stopInfo.state;
if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') { if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') {
lastFunctionalEvent = new Date().getTime(); lastFunctionalEvent = new Date().getTime();

0
src/libraries/screensavermanager.scss → src/scripts/screensavermanager.scss
View File

4
src/scripts/site.js
View File

@ -26,7 +26,7 @@ import './routes';
import '../components/themeMediaPlayer'; import '../components/themeMediaPlayer';
import './autoBackdrops'; import './autoBackdrops';
import { pageClassOn, serverAddress } from './clientUtils'; import { pageClassOn, serverAddress } from './clientUtils';
import '../libraries/screensavermanager'; import './screensavermanager';
import './serverNotifications'; import './serverNotifications';
import '../components/playback/playerSelectionMenu'; import '../components/playback/playerSelectionMenu';
import '../legacy/domParserTextHtml'; import '../legacy/domParserTextHtml';
@ -39,7 +39,7 @@ import SyncPlayNoActivePlayer from '../components/syncPlay/ui/players/NoActivePl
import SyncPlayHtmlVideoPlayer from '../components/syncPlay/ui/players/HtmlVideoPlayer'; import SyncPlayHtmlVideoPlayer from '../components/syncPlay/ui/players/HtmlVideoPlayer';
import SyncPlayHtmlAudioPlayer from '../components/syncPlay/ui/players/HtmlAudioPlayer'; import SyncPlayHtmlAudioPlayer from '../components/syncPlay/ui/players/HtmlAudioPlayer';
import { currentSettings } from './settings/userSettings'; import { currentSettings } from './settings/userSettings';
import taskButton from '../scripts/taskbutton'; import taskButton from './taskbutton';
// TODO: Move this elsewhere // TODO: Move this elsewhere
window.getWindowLocationSearch = function(win) { window.getWindowLocationSearch = function(win) {