From 13f472d7d5f915b9d2da72e8b104f043897255bc Mon Sep 17 00:00:00 2001 From: ferferga Date: Tue, 9 Jun 2020 00:48:56 +0200 Subject: [PATCH 1/4] Fix episodes listing after blurhash --- src/components/listview/listview.js | 23 +++++++++++++---------- src/controllers/itemDetails.js | 3 ++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index 7bafc925b..392372dd1 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -81,23 +81,26 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan options.tag = item.ImageTags.Primary; itemId = item.Id; } - - if (item.AlbumId && item.AlbumPrimaryImageTag) { - options.tag = item.AlbumPrimaryImageTag; - itemId = item.AlbumId; - } else if (item.SeriesId && item.SeriesPrimaryImageTag) { - options.tag = item.SeriesPrimaryImageTag; - itemId = item.SeriesId; - } else if (item.ParentPrimaryImageTag) { - options.tag = item.ParentPrimaryImageTag; - itemId = item.ParentPrimaryImageItemId; + if (!itemId) { + if (item.AlbumId && item.AlbumPrimaryImageTag) { + options.tag = item.AlbumPrimaryImageTag; + itemId = item.AlbumId; + } else if (item.SeriesId && item.SeriesPrimaryImageTag) { + options.tag = item.SeriesPrimaryImageTag; + itemId = item.SeriesId; + } else if (item.ParentPrimaryImageTag) { + options.tag = item.ParentPrimaryImageTag; + 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 null; } function getChannelImageUrl(item, width) { diff --git a/src/controllers/itemDetails.js b/src/controllers/itemDetails.js index cbb8a1b43..01f618750 100644 --- a/src/controllers/itemDetails.js +++ b/src/controllers/itemDetails.js @@ -1840,7 +1840,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti chaptercardbuilder.buildChapterCards(item, chapters, { itemsContainer: scenesContent, backdropShape: 'overflowBackdrop', - squareShape: 'overflowSquare' + squareShape: 'overflowSquare', + imageBlurhashes: item.ImageBlurHashes }); }); } else { From 7a9e75fd718aba13fdad496aeaed7bc1367beee2 Mon Sep 17 00:00:00 2001 From: ferferga Date: Tue, 9 Jun 2020 00:58:55 +0200 Subject: [PATCH 2/4] Make linter happy --- src/components/listview/listview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index 392372dd1..c759b0a9a 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -93,7 +93,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan itemId = item.ParentPrimaryImageItemId; } } - + let blurHashes = item.ImageBlurHashes || {}; let blurhashstr = (blurHashes[options.type] || {})[options.tag]; From 8c85ed499269b452449e5bc70b59c778a5d61d94 Mon Sep 17 00:00:00 2001 From: ferferga Date: Wed, 10 Jun 2020 10:52:33 +0200 Subject: [PATCH 3/4] Use else instead --- src/components/listview/listview.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index c759b0a9a..42f32ba79 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -80,18 +80,15 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan if (item.ImageTags && item.ImageTags.Primary) { options.tag = item.ImageTags.Primary; itemId = item.Id; - } - if (!itemId) { - if (item.AlbumId && item.AlbumPrimaryImageTag) { - options.tag = item.AlbumPrimaryImageTag; - itemId = item.AlbumId; - } else if (item.SeriesId && item.SeriesPrimaryImageTag) { - options.tag = item.SeriesPrimaryImageTag; - itemId = item.SeriesId; - } else if (item.ParentPrimaryImageTag) { - options.tag = item.ParentPrimaryImageTag; - itemId = item.ParentPrimaryImageItemId; - } + } else if (item.AlbumId && item.AlbumPrimaryImageTag) { + options.tag = item.AlbumPrimaryImageTag; + itemId = item.AlbumId; + } else if (item.SeriesId && item.SeriesPrimaryImageTag) { + options.tag = item.SeriesPrimaryImageTag; + itemId = item.SeriesId; + } else if (item.ParentPrimaryImageTag) { + options.tag = item.ParentPrimaryImageTag; + itemId = item.ParentPrimaryImageItemId; } let blurHashes = item.ImageBlurHashes || {}; From d236eeeb5bb8567530fe6538ffc48ccf706755d6 Mon Sep 17 00:00:00 2001 From: ferferga Date: Wed, 10 Jun 2020 11:53:00 +0200 Subject: [PATCH 4/4] Fix mouseover in episode list when using blurhash --- src/components/images/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/images/style.css b/src/components/images/style.css index a709f732c..a20d242ef 100644 --- a/src/components/images/style.css +++ b/src/components/images/style.css @@ -29,4 +29,5 @@ width: 100%; height: 100%; z-index: 100; + pointer-events: none; }