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

Disallow block padding

Browse source
This commit is contained in:
MrTimscampi 2020-07-27 08:06:46 +02:00
parent 454b81a037
commit 5e1b6acffe
126 changed files with 2 additions and 2127 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/themeMediaPlayer.js
View file

@ -5,13 +5,11 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
var currentThemeIds = [];
function playThemeMedia(items, ownerId) {
var currentThemeItems = items.filter(function (i) {
return enabled(i.MediaType);
});
if (currentThemeItems.length) {
// Stop if a theme song from another ownerId
// Leave it alone if anything else (e.g user playing a movie)
if (!currentOwnerId && playbackManager.isPlaying()) {
@ -29,7 +27,6 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
}).then(function () {
currentOwnerId = ownerId;
});
} else {
stopIfPlaying();
}
@ -44,7 +41,6 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
}
function enabled(mediaType) {
if (mediaType === 'Video') {
return userSettings.enableThemeVideos();
}
@ -55,7 +51,6 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
var excludeTypes = ['CollectionFolder', 'UserView', 'Program', 'SeriesTimer', 'Person', 'TvChannel', 'Channel'];
function loadThemeMedia(item) {
if (item.CollectionType) {
stopIfPlaying();
return;
@ -68,11 +63,9 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
var apiClient = connectionManager.getApiClient(item.ServerId);
apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) {
var ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId;
if (ownerId !== currentOwnerId) {
var items = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.Items : themeMediaResult.ThemeSongsResult.Items;
playThemeMedia(items, ownerId);
@ -81,7 +74,6 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
}
document.addEventListener('viewshow', function (e) {
var state = e.detail.state || {};
var item = state.item;
@ -97,7 +89,6 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
} else {
playThemeMedia([], null);
}
}, true);
Events.on(playbackManager, 'playbackstart', function (e, player) {
@ -107,5 +98,4 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
currentOwnerId = null;
}
});
});