ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix playlist thumbnails
Chocobozzzaed1d53fd2ac
diff --git a/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.scss b/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.scssindex d110240985..a0b926bfa5 100644--- a/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.scss+++ b/client/src/app/+video-watch/shared/recommendations/recommended-videos.component.scss@@ -50,6 +50,7 @@ my-video-miniature {.other-videos:not(.display-as-row) my-video-miniature {--co-miniature-max-width: #{$video-thumbnail-medium-width};+ --thumbnail-width: var(--co-miniature-max-width); // Required by video-thumbnail componentmin-width: var(--co-miniature-min-width);max-width: var(--co-miniature-max-width);diff --git a/client/src/app/shared/shared-tables/video-cell.component.scss b/client/src/app/shared/shared-tables/video-cell.component.scssindex eac9c796ac..c3b3be0624 100644--- a/client/src/app/shared/shared-tables/video-cell.component.scss+++ b/client/src/app/shared/shared-tables/video-cell.component.scss@@ -10,6 +10,7 @@.root {--co-image-height: 78px;--co-image-width: #{getWidth(78px)};+ --thumbnail-width: var(--co-image-width); // Required by video-thumbnail componentdisplay: flex;align-items: center;diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.tsindex d66395a652..c4099e5f10 100644--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts@@ -4,6 +4,7 @@ import { RouterLink } from '@angular/router'import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'import { Video as VideoServerModel, VideoState } from '@peertube/peertube-models'import { findAppropriateImageFileUrl } from '@root-helpers/images'+import { logger } from '@root-helpers/logger'import { GlobalIconComponent } from '../shared-icons/global-icon.component'import { FromNowPipe } from '../shared-main/date/from-now.pipe'import { Video } from '../shared-main/video/video.model'@@ -101,11 +102,14 @@ export class VideoThumbnailComponent implements OnChanges {const computedStyle = window.getComputedStyle(this.el.nativeElement)- const cssVariable = computedStyle.getPropertyValue('--co-miniature-max-width') ||- computedStyle.getPropertyValue('--co-row-thumbnail-width') ||- computedStyle.getPropertyValue('--co-image-width')+ const cssVariable = computedStyle.getPropertyValue('--thumbnail-width')- const widthStr = cssVariable.replace('px', '').trim()+ let widthStr = cssVariable.replace('px', '').trim()++ if (!widthStr) {+ logger.error('Cannot find thumbnail width in CSS variables. Fallback to 280px')+ widthStr = '280'+ }return findAppropriateImageFileUrl(video.thumbnails, +widthStr)}diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss b/client/src/app/shared/shared-video-miniature/video-miniature.component.scssindex 58f6c58bab..3a2148e343 100644--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss@@ -173,6 +173,7 @@ my-actor-host {--co-row-thumbnail-width: #{$video-thumbnail-width};--co-row-thumbnail-height: #{$video-thumbnail-height};+ --thumbnail-width: var(--co-row-thumbnail-width); // Required by video-thumbnail componentdisplay: flex;flex-direction: row;diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.scss b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.scssindex ba18b56fbf..7a2c143eb5 100644--- a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.scss+++ b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.scss@@ -8,6 +8,7 @@ $thumbnail-height: 72px;.video {--co-miniature-width: #{$thumbnail-width};--co-miniature-height: #{$thumbnail-height};+ --thumbnail-width: var(--co-miniature-width); // Required by video-thumbnail component}my-timestamp-input {diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scssindex 687e6582f4..84a48d4bf3 100644--- a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss+++ b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss@@ -96,6 +96,7 @@// Keep it sync with image size requested by the component--co-row-thumbnail-width: #{$video-thumbnail-width};--co-row-thumbnail-height: #{$video-thumbnail-height};+ --thumbnail-width: var(--co-row-thumbnail-width); // Required by video-thumbnail componentdisplay: flex;diff --git a/client/src/app/shared/shared-video-playlist/video-playlist.model.ts b/client/src/app/shared/shared-video-playlist/video-playlist.model.tsindex 686e658281..005b65a01d 100644--- a/client/src/app/shared/shared-video-playlist/video-playlist.model.ts+++ b/client/src/app/shared/shared-video-playlist/video-playlist.model.ts@@ -74,6 +74,8 @@ export class VideoPlaylist implements ServerVideoPlaylist {this.type = hash.type+ this.thumbnails = hash.thumbnails+this.createdAt = new Date(hash.createdAt)this.updatedAt = new Date(hash.updatedAt)diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scssindex 0e15b83c27..6c14bc099b 100644--- a/client/src/sass/include/_miniature.scss+++ b/client/src/sass/include/_miniature.scss@@ -126,6 +126,7 @@.playlists {--co-miniature-min-width: #{$video-thumbnail-width - 25px};--co-miniature-max-width: #{$video-thumbnail-width};+ --thumbnail-width: var(--co-miniature-max-width); // Required by video-thumbnail componentdisplay: grid;column-gap: 30px;