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

fix merge conflict

Browse source
This commit is contained in:
viown 2024-09-08 13:53:29 +03:00 • committed by Bill Thornton
parent c33ee1b381
commit 5396e3c95c
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/index.jsx
View file

@ -74,7 +74,7 @@ build: ${__JF_BUILD_VERSION__}`);
} }
// Initialize automatic (default) cast target // Initialize automatic (default) cast target
initializeAutoCast(ServerConnections.currentApiClient()); initializeAutoCast();
// Load the translation dictionary // Load the translation dictionary
await loadCoreDictionary(); await loadCoreDictionary();

23
src/scripts/autocast.js
View file

@ -1,3 +1,4 @@
import ServerConnections from 'components/ServerConnections';
import { playbackManager } from '../components/playback/playbackmanager'; import { playbackManager } from '../components/playback/playbackmanager';
import Events from '../utils/events.ts'; import Events from '../utils/events.ts';
@ -43,16 +44,14 @@ function onOpen() {
}); });
} }
export function initialize(apiClient) { export function initialize() {
if (apiClient) { ServerConnections.getApiClients().forEach(apiClient => {
if (apiClient.isWebSocketOpen()) { Events.off(apiClient, 'websocketopen', onOpen);
console.debug('[autoCast] connection ready'); Events.on(apiClient, 'websocketopen', onOpen);
onOpen(); });
} else {
console.debug('[autoCast] initializing connection listener'); Events.on(ServerConnections, 'apiclientcreated', (e, apiClient) => {
Events.on(apiClient, 'websocketopen', onOpen); Events.off(apiClient, 'websocketopen', onOpen);
} Events.on(apiClient, 'websocketopen', onOpen);
} else { });
console.warn('[autoCast] cannot initialize missing apiClient');
}
} }