Merge branch 'jellyfin:master' into master

This commit is contained in:
Jack Vanier 2021-08-14 20:30:45 -04:00 committed by GitHub
commit 2aecd89d6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 1513 additions and 1241 deletions

View file

@ -397,7 +397,7 @@ import ServerConnections from '../ServerConnections';
const itemsContainer = elem.querySelector('.itemsContainer');
itemsContainer.fetchData = getItemsToResumeFn(mediaType, apiClient.serverId());
itemsContainer.getItemsHtml = getItemsToResumeHtmlFn(userSettings.useEpisodeImagesInNextUpAndResume());
itemsContainer.getItemsHtml = getItemsToResumeHtmlFn(userSettings.useEpisodeImagesInNextUpAndResume(), mediaType);
itemsContainer.parentContainer = elem;
}
@ -428,14 +428,14 @@ import ServerConnections from '../ServerConnections';
};
}
function getItemsToResumeHtmlFn(useEpisodeImages) {
function getItemsToResumeHtmlFn(useEpisodeImages, mediaType) {
return function (items) {
const cardLayout = false;
return cardBuilder.getCardsHtml({
items: items,
preferThumb: true,
inheritThumb: !useEpisodeImages,
defaultShape: getThumbShape(),
shape: (mediaType === 'Book') ? getPortraitShape() : getThumbShape(),
overlayText: false,
showTitle: true,
showParentTitle: true,