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

Merge remote-tracking branch 'upstream/master' into remux-translation

This commit is contained in:
nyanmisaka 2020-11-20 12:19:48 +08:00
commit c87df522b3
286 changed files with 6560 additions and 6111 deletions

View file

@ -1,11 +1,12 @@
import events from 'events';
import globalize from 'globalize';
import playbackManager from 'playbackManager';
import syncPlayManager from 'syncPlayManager';
import playMethodHelper from 'playMethodHelper';
import layoutManager from 'layoutManager';
import 'paper-icon-button-light';
import 'css!./playerstats';
import { Events } from 'jellyfin-apiclient';
import '../../elements/emby-button/paper-icon-button-light';
import globalize from '../../scripts/globalize';
import layoutManager from '../layoutManager';
import { playbackManager } from '../playback/playbackmanager';
import playMethodHelper from '../playback/playmethodhelper';
import syncPlayManager from '../syncPlay/syncPlayManager';
import './playerstats.css';
import ServerConnections from '../ServerConnections';
/* eslint-disable indent */
@ -94,7 +95,7 @@ import 'css!./playerstats';
return Promise.resolve(instance.lastSession);
}
const apiClient = window.connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
const apiClient = ServerConnections.getApiClient(playbackManager.currentItem(player).ServerId);
return apiClient.getSessions({
deviceId: apiClient.deviceId()
@ -431,7 +432,7 @@ import 'css!./playerstats';
name: globalize.translate('LabelOriginalMediaInfo')
});
const apiClient = window.connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
const apiClient = ServerConnections.getApiClient(playbackManager.currentItem(player).ServerId);
if (syncPlayManager.isSyncPlayEnabled() && apiClient.isMinServerVersion('10.6.0')) {
categories.push({
stats: getSyncPlayStats(),
@ -468,14 +469,14 @@ import 'css!./playerstats';
};
instance.onTimeUpdate = localOnTimeUpdate;
events.on(player, 'timeupdate', localOnTimeUpdate);
Events.on(player, 'timeupdate', localOnTimeUpdate);
}
function unbindEvents(instance, player) {
const localOnTimeUpdate = instance.onTimeUpdate;
if (localOnTimeUpdate) {
events.off(player, 'timeupdate', localOnTimeUpdate);
Events.off(player, 'timeupdate', localOnTimeUpdate);
}
}