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

Merge branch 'master' into return-of-the-scrollbar

This commit is contained in:
Dmitry Lyzo 2020-11-20 09:28:55 +03:00 committed by GitHub
commit c2b1d02a33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
321 changed files with 7572 additions and 6563 deletions

View file

@ -1,9 +1,10 @@
import events from 'events';
import playbackManager from 'playbackManager';
import pluginManager from 'pluginManager';
import inputManager from 'inputManager';
import * as userSettings from 'userSettings';
import 'css!./screensavermanager.css';
import { Events } from 'jellyfin-apiclient';
import { playbackManager } from '../components/playback/playbackmanager';
import { pluginManager } from '../components/pluginManager';
import inputManager from '../scripts/inputManager';
import * as userSettings from '../scripts/settings/userSettings';
import ServerConnections from '../components/ServerConnections';
import './screensavermanager.css';
function getMinIdleTime() {
// Returns the minimum amount of idle time required before the screen saver can be displayed
@ -17,7 +18,7 @@ function getFunctionalEventIdleTime() {
return new Date().getTime() - lastFunctionalEvent;
}
events.on(playbackManager, 'playbackstop', function (e, stopInfo) {
Events.on(playbackManager, 'playbackstop', function (e, stopInfo) {
const state = stopInfo.state;
if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') {
lastFunctionalEvent = new Date().getTime();
@ -89,7 +90,7 @@ function ScreenSaverManager() {
this.show = function () {
let isLoggedIn;
const apiClient = window.connectionManager.currentApiClient();
const apiClient = ServerConnections.currentApiClient();
if (apiClient && apiClient.isLoggedIn()) {
isLoggedIn = true;