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

Remove blurhash from listView

Browse source 
As-is, correctly implementing blurhash on the listView would lead to significant changes to listView itself, to cardBuilder and to various places calling listView.
As a hotfix for 10.6, it is less invasive to revert the changes adding blurhash to listView and to postpone adding it to that component in 10.7, by removing the custom image creationg in order to use a card.
This commit is contained in:
MrTimscampi 2020-07-03 17:21:53 +02:00
parent 995b376bc4
commit fef24c24e2
1 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,11 +91,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
itemId = item.ParentPrimaryImageItemId; itemId = item.ParentPrimaryImageItemId;
} }
let blurHashes = item.ImageBlurHashes || {};
let blurhashstr = (blurHashes[options.type] || {})[options.tag];
if (itemId) { if (itemId) {
return { url: apiClient.getScaledImageUrl(itemId, options), blurhash: blurhashstr }; return apiClient.getScaledImageUrl(itemId, options);
} }
return null; return null;
} }
@ -111,16 +108,13 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (item.ChannelId && item.ChannelPrimaryImageTag) { if (item.ChannelId && item.ChannelPrimaryImageTag) {
options.tag = item.ChannelPrimaryImageTag; options.tag = item.ChannelPrimaryImageTag;
} }
let blurHashes = item.ImageBlurHashes || {};
let blurhashstr = (blurHashes[options.type])[options.tag];
if (item.ChannelId) { if (item.ChannelId) {
return { url: apiClient.getScaledImageUrl(item.ChannelId, options), blurhash: blurhashstr }; return apiClient.getScaledImageUrl(item.ChannelId, options);
} }
} }
function getTextLinesHtml(textlines, isLargeStyle) { function getTextLinesHtml(textlines, isLargeStyle) {
var html = ''; var html = '';
var largeTitleTagName = layoutManager.tv ? 'h2' : 'div'; var largeTitleTagName = layoutManager.tv ? 'h2' : 'div';
@ -266,14 +260,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
} }
if (options.image !== false) { if (options.image !== false) {
let imgData = options.imageSource === 'channel' ? getChannelImageUrl(item, downloadWidth) : getImageUrl(item, downloadWidth); var imgUrl = options.imageSource === 'channel' ? getChannelImageUrl(item, downloadWidth) : getImageUrl(item, downloadWidth);
let imgUrl; var imageClass = isLargeStyle ? 'listItemImage listItemImage-large' : 'listItemImage';
let blurhash;
if (imgData) {
imgUrl = imgData.url;
blurhash = imgData.blurhash;
}
let imageClass = isLargeStyle ? 'listItemImage listItemImage-large' : 'listItemImage';
if (isLargeStyle && layoutManager.tv) { if (isLargeStyle && layoutManager.tv) {
imageClass += ' listItemImage-large-tv'; imageClass += ' listItemImage-large-tv';
@ -287,13 +275,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var imageAction = playOnImageClick ? 'resume' : action; var imageAction = playOnImageClick ? 'resume' : action;
let blurhashAttrib = '';
if (blurhash && blurhash.length > 0) {
blurhashAttrib = 'data-blurhash="' + blurhash + '"';
}
if (imgUrl) { if (imgUrl) {
html += '<div data-action="' + imageAction + '" class="' + imageClass + ' lazy" data-src="' + imgUrl + '" ' + blurhashAttrib + ' item-icon>'; html += '<div data-action="' + imageAction + '" class="' + imageClass + ' lazy" data-src="' + imgUrl + '" item-icon>';
} else { } else {
html += '<div class="' + imageClass + ' cardImageContainer ' + cardBuilder.getDefaultBackgroundClass(item.Name) + '">' + cardBuilder.getDefaultText(item, options); html += '<div class="' + imageClass + ' cardImageContainer ' + cardBuilder.getDefaultBackgroundClass(item.Name) + '">' + cardBuilder.getDefaultText(item, options);
} }