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

Use connectionManager global

Browse source
This commit is contained in:
MrTimscampi 2020-08-30 06:06:47 +02:00
parent 4d540bf9ca
commit c97d7a6f59
79 changed files with 233 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/plugins/backdropScreensaver/plugin.js
View file

@ -1,5 +1,4 @@
/* eslint-disable indent */
import connectionManager from 'connectionManager';
class BackdropScreensaver {
constructor() {
@ -21,7 +20,7 @@ class BackdropScreensaver {
Limit: 200
};
const apiClient = connectionManager.currentApiClient();
const apiClient = window.connectionManager.currentApiClient();
apiClient.getItems(apiClient.getCurrentUserId(), query).then((result) => {
if (result.Items.length) {
import('slideshow').then(({default: Slideshow}) => {

3
src/plugins/bookPlayer/plugin.js
View file

@ -1,4 +1,3 @@
import connectionManager from 'connectionManager';
import loading from 'loading';
import keyboardnavigation from 'keyboardnavigation';
import dialogHelper from 'dialogHelper';
@ -243,7 +242,7 @@ export class BookPlayer {
};
const serverId = item.ServerId;
const apiClient = connectionManager.getApiClient(serverId);
const apiClient = window.connectionManager.getApiClient(serverId);
return new Promise((resolve, reject) => {
import('epubjs').then(({default: epubjs}) => {

4
src/plugins/chromecastPlayer/chromecastHelper.js
View file

@ -221,8 +221,8 @@ function getCachedValue(key) {
return null;
}
events.on(ConnectionManager, 'localusersignedin', clearCache);
events.on(ConnectionManager, 'localusersignedout', clearCache);
events.on(window.connectionManager, 'localusersignedin', clearCache);
events.on(window.connectionManager, 'localusersignedout', clearCache);
export default {
getServerAddress: getServerAddress

15
src/plugins/chromecastPlayer/plugin.js
View file

@ -1,7 +1,6 @@
import appSettings from 'appSettings';
import * as userSettings from 'userSettings';
import playbackManager from 'playbackManager';
import connectionManager from 'connectionManager';
import globalize from 'globalize';
import events from 'events';
import castSenderApiLoader from 'castSenderApiLoader';
@ -325,11 +324,11 @@ class CastPlayer {
let apiClient;
if (message.options && message.options.ServerId) {
apiClient = connectionManager.getApiClient(message.options.ServerId);
apiClient = window.connectionManager.getApiClient(message.options.ServerId);
} else if (message.options && message.options.items && message.options.items.length) {
apiClient = connectionManager.getApiClient(message.options.items[0].ServerId);
apiClient = window.connectionManager.getApiClient(message.options.items[0].ServerId);
} else {
apiClient = connectionManager.currentApiClient();
apiClient = window.connectionManager.currentApiClient();
}
message = Object.assign(message, {
@ -673,7 +672,7 @@ class ChromecastPlayer {
playWithCommand(options, command) {
if (!options.items) {
const apiClient = connectionManager.getApiClient(options.serverId);
const apiClient = window.connectionManager.getApiClient(options.serverId);
const instance = this;
return apiClient.getItem(apiClient.getCurrentUserId(), options.ids[0]).then(function (item) {
@ -985,7 +984,7 @@ class ChromecastPlayer {
}
shuffle(item) {
const apiClient = connectionManager.getApiClient(item.ServerId);
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const userId = apiClient.getCurrentUserId();
const instance = this;
@ -998,7 +997,7 @@ class ChromecastPlayer {
}
instantMix(item) {
const apiClient = connectionManager.getApiClient(item.ServerId);
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const userId = apiClient.getCurrentUserId();
const instance = this;
@ -1036,7 +1035,7 @@ class ChromecastPlayer {
}
const instance = this;
const apiClient = connectionManager.getApiClient(options.serverId);
const apiClient = window.connectionManager.getApiClient(options.serverId);
return getItemsForPlayback(apiClient, {
Ids: options.ids.join(',')

5
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -5,7 +5,6 @@ import loading from 'loading';
import dom from 'dom';
import playbackManager from 'playbackManager';
import appRouter from 'appRouter';
import connectionManager from 'connectionManager';
import {
bindEventsToHlsPlayer,
destroyHlsPlayer,
@ -325,7 +324,7 @@ function tryRemoveElement(elem) {
console.debug(`prefetching hls playlist: ${hlsPlaylistUrl}`);
return connectionManager.getApiClient(item.ServerId).ajax({
return window.connectionManager.getApiClient(item.ServerId).ajax({
type: 'GET',
url: hlsPlaylistUrl
@ -1036,7 +1035,7 @@ function tryRemoveElement(elem) {
*/
renderSsaAss(videoElement, track, item) {
const attachments = this._currentPlayOptions.mediaSource.MediaAttachments || [];
const apiClient = connectionManager.getApiClient(item);
const apiClient = window.connectionManager.getApiClient(item);
const htmlVideoPlayer = this;
const options = {
video: videoElement,

3
src/plugins/photoPlayer/plugin.js
View file

@ -1,4 +1,3 @@
import connectionManager from 'connectionManager';
export default class PhotoPlayer {
constructor() {
@ -13,7 +12,7 @@ export default class PhotoPlayer {
import('slideshow').then(({default: slideshow}) => {
var index = options.startIndex || 0;
var apiClient = connectionManager.currentApiClient();
var apiClient = window.connectionManager.currentApiClient();
apiClient.getCurrentUser().then(function(result) {
var newSlideShow = new slideshow({
showTitle: false,

3
src/plugins/playAccessValidation/plugin.js
View file

@ -1,4 +1,3 @@
import connectionManager from 'connectionManager';
import globalize from 'globalize';
function showErrorMessage() {
@ -25,7 +24,7 @@ class PlayAccessValidation {
return Promise.resolve();
}
return connectionManager.getApiClient(serverId).getCurrentUser().then(function (user) {
return window.connectionManager.getApiClient(serverId).getCurrentUser().then(function (user) {
if (user.Policy.EnableMediaPlayback) {
return Promise.resolve();
}

5
src/plugins/sessionPlayer/plugin.js
View file

@ -1,7 +1,6 @@
import playbackManager from 'playbackManager';
import events from 'events';
import serverNotifications from 'serverNotifications';
import connectionManager from 'connectionManager';
function getActivePlayerId() {
const info = playbackManager.getPlayerInfo();
@ -54,10 +53,10 @@ function getCurrentApiClient(instance) {
const currentServerId = instance.currentServerId;
if (currentServerId) {
return connectionManager.getApiClient(currentServerId);
return window.connectionManager.getApiClient(currentServerId);
}
return connectionManager.currentApiClient();
return window.connectionManager.currentApiClient();
}
function sendCommandByName(instance, name, options) {