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 'master' into return-of-the-scrollbar

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

10
src/libraries/navdrawer/navdrawer.js
View file

@ -3,12 +3,12 @@
*/
/* eslint-disable no-var */
import browser from 'browser';
import dom from 'dom';
import 'css!./navdrawer';
import 'scrollStyles';
import browser from '../../scripts/browser';
import dom from '../../scripts/dom';
import './navdrawer.css';
import '../../assets/css/scrollstyles.css';
export default function (options) {
export function NavigationDrawer(options) {
function getTouches(e) {
return e.changedTouches || e.targetTouches || e.touches;
}

17
src/libraries/screensavermanager.js
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;

12
src/libraries/scroller.js
View file

@ -2,12 +2,12 @@
* and will be replaced soon by a Vue component.
*/
import browser from 'browser';
import layoutManager from 'layoutManager';
import dom from 'dom';
import focusManager from 'focusManager';
import ResizeObserver from 'ResizeObserver';
import 'scrollStyles';
import browser from '../scripts/browser';
import layoutManager from '../components/layoutManager';
import dom from '../scripts/dom';
import focusManager from '../components/focusManager';
import ResizeObserver from 'resize-observer-polyfill';
import '../assets/css/scrollstyles.css';
/**
* Return type of the value.