From fef24c24e2e1846636337b0c67b81ef088304bcd Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Fri, 3 Jul 2020 17:21:53 +0200 Subject: [PATCH] Remove blurhash from listView 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. --- src/components/listview/listview.js | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index 22e5e51325..dda0d34903 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -91,11 +91,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan itemId = item.ParentPrimaryImageItemId; } - let blurHashes = item.ImageBlurHashes || {}; - let blurhashstr = (blurHashes[options.type] || {})[options.tag]; - if (itemId) { - return { url: apiClient.getScaledImageUrl(itemId, options), blurhash: blurhashstr }; + return apiClient.getScaledImageUrl(itemId, options); } return null; } @@ -111,16 +108,13 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan if (item.ChannelId && item.ChannelPrimaryImageTag) { options.tag = item.ChannelPrimaryImageTag; } - let blurHashes = item.ImageBlurHashes || {}; - let blurhashstr = (blurHashes[options.type])[options.tag]; if (item.ChannelId) { - return { url: apiClient.getScaledImageUrl(item.ChannelId, options), blurhash: blurhashstr }; + return apiClient.getScaledImageUrl(item.ChannelId, options); } } function getTextLinesHtml(textlines, isLargeStyle) { - var html = ''; var largeTitleTagName = layoutManager.tv ? 'h2' : 'div'; @@ -266,14 +260,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan } if (options.image !== false) { - let imgData = options.imageSource === 'channel' ? getChannelImageUrl(item, downloadWidth) : getImageUrl(item, downloadWidth); - let imgUrl; - let blurhash; - if (imgData) { - imgUrl = imgData.url; - blurhash = imgData.blurhash; - } - let imageClass = isLargeStyle ? 'listItemImage listItemImage-large' : 'listItemImage'; + var imgUrl = options.imageSource === 'channel' ? getChannelImageUrl(item, downloadWidth) : getImageUrl(item, downloadWidth); + var imageClass = isLargeStyle ? 'listItemImage listItemImage-large' : 'listItemImage'; if (isLargeStyle && layoutManager.tv) { imageClass += ' listItemImage-large-tv'; @@ -287,13 +275,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan var imageAction = playOnImageClick ? 'resume' : action; - let blurhashAttrib = ''; - if (blurhash && blurhash.length > 0) { - blurhashAttrib = 'data-blurhash="' + blurhash + '"'; - } - if (imgUrl) { - html += '
'; + html += '
'; } else { html += '
' + cardBuilder.getDefaultText(item, options); }