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 #1386 from ferferga/blurhash

Browse source 
Fix episodes listing after blurhash
This commit is contained in:
dkanada 2020-06-10 20:35:39 +09:00 • committed by GitHub
commit 5ea00655fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/images/style.css
View file

@ -29,4 +29,5 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 100; z-index: 100;
pointer-events: none;
} }

6
src/components/listview/listview.js
View file

@ -80,9 +80,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (item.ImageTags && item.ImageTags.Primary) { if (item.ImageTags && item.ImageTags.Primary) {
options.tag = item.ImageTags.Primary; options.tag = item.ImageTags.Primary;
itemId = item.Id; itemId = item.Id;
} } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
itemId = item.AlbumId; itemId = item.AlbumId;
} else if (item.SeriesId && item.SeriesPrimaryImageTag) { } else if (item.SeriesId && item.SeriesPrimaryImageTag) {
@ -92,12 +90,14 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
options.tag = item.ParentPrimaryImageTag; options.tag = item.ParentPrimaryImageTag;
itemId = item.ParentPrimaryImageItemId; itemId = item.ParentPrimaryImageItemId;
} }
let blurHashes = item.ImageBlurHashes || {}; let blurHashes = item.ImageBlurHashes || {};
let blurhashstr = (blurHashes[options.type] || {})[options.tag]; let blurhashstr = (blurHashes[options.type] || {})[options.tag];
if (itemId) { if (itemId) {
return { url: apiClient.getScaledImageUrl(itemId, options), blurhash: blurhashstr }; return { url: apiClient.getScaledImageUrl(itemId, options), blurhash: blurhashstr };
} }
return null;
} }
function getChannelImageUrl(item, width) { function getChannelImageUrl(item, width) {

3
src/controllers/itemDetails.js
View file

@ -1840,7 +1840,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
chaptercardbuilder.buildChapterCards(item, chapters, { chaptercardbuilder.buildChapterCards(item, chapters, {
itemsContainer: scenesContent, itemsContainer: scenesContent,
backdropShape: 'overflowBackdrop', backdropShape: 'overflowBackdrop',
squareShape: 'overflowSquare' squareShape: 'overflowSquare',
imageBlurhashes: item.ImageBlurHashes
}); });
}); });
} else { } else {