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 pull request #3500 from dmitrylyzo/fix-theme-queue

Browse source
This commit is contained in:
Bill Thornton 2022-03-13 00:30:50 -05:00 • committed by GitHub
commit 96efa7cd72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/themeMediaPlayer.js
View file

@ -22,6 +22,13 @@ function playThemeMedia(items, ownerId) {
return i.Id; return i.Id;
}); });
currentThemeItems.forEach((i) => {
i.playOptions = {
fullscreen: false,
enableRemotePlayers: false
};
});
playbackManager.play({ playbackManager.play({
items: currentThemeItems, items: currentThemeItems,
fullscreen: false, fullscreen: false,
@ -65,12 +72,12 @@ function loadThemeMedia(item) {
const apiClient = ServerConnections.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) { apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) {
const ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId; const result = userSettings.enableThemeVideos() && themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult : themeMediaResult.ThemeSongsResult;
const ownerId = result.OwnerId;
if (ownerId !== currentOwnerId) { if (ownerId !== currentOwnerId) {
const items = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.Items : themeMediaResult.ThemeSongsResult.Items; playThemeMedia(result.Items, ownerId);
playThemeMedia(items, ownerId);
} }
}); });
} }