diff options
author | Chocobozzz <me@florianbigard.com> | 2021-06-17 16:02:38 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2021-06-25 14:44:01 +0200 |
commit | 37a44fc915eef2140e22ceb96aba6b6eb2509007 (patch) | |
tree | dd4a370ecc96cf38c99b940261aadc27065da7ae /client/src/app/shared/shared-video-miniature | |
parent | 33eb19e5199cc9fa4d73c6675c97508e3e072ef9 (diff) | |
download | PeerTube-37a44fc915eef2140e22ceb96aba6b6eb2509007.tar.gz PeerTube-37a44fc915eef2140e22ceb96aba6b6eb2509007.tar.zst PeerTube-37a44fc915eef2140e22ceb96aba6b6eb2509007.zip |
Add ability to search playlists
Diffstat (limited to 'client/src/app/shared/shared-video-miniature')
-rw-r--r-- | client/src/app/shared/shared-video-miniature/video-miniature.component.html | 13 | ||||
-rw-r--r-- | client/src/app/shared/shared-video-miniature/video-miniature.component.ts | 5 |
2 files changed, 8 insertions, 10 deletions
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html index 6c34123ed..7765d5be7 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html | |||
@@ -21,13 +21,12 @@ | |||
21 | ></my-actor-avatar> | 21 | ></my-actor-avatar> |
22 | 22 | ||
23 | <div class="w-100 d-flex flex-column"> | 23 | <div class="w-100 d-flex flex-column"> |
24 | <a *ngIf="!videoHref" tabindex="-1" class="video-miniature-name" | 24 | <my-link |
25 | [routerLink]="videoRouterLink" [attr.title]="video.name" [ngClass]="{ 'blur-filter': isVideoBlur }" | 25 | [internalLink]="videoRouterLink" [href]="videoHref" [target]="videoTarget" |
26 | >{{ video.name }}</a> | 26 | [title]="video.name"class="video-miniature-name" [ngClass]="{ 'blur-filter': isVideoBlur }" tabindex="-1" |
27 | 27 | > | |
28 | <a *ngIf="videoHref" tabindex="-1" class="video-miniature-name" | 28 | {{ video.name }} |
29 | [href]="videoHref" [target]="videoTarget" [attr.title]="video.name" [ngClass]="{ 'blur-filter': isVideoBlur }" | 29 | </my-link> |
30 | >{{ video.name }}</a> | ||
31 | 30 | ||
32 | <span class="video-miniature-created-at-views"> | 31 | <span class="video-miniature-created-at-views"> |
33 | <my-date-toggle *ngIf="displayOptions.date" [date]="video.publishedAt"></my-date-toggle> | 32 | <my-date-toggle *ngIf="displayOptions.date" [date]="video.publishedAt"></my-date-toggle> |
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts index fc066846a..fe161c977 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts | |||
@@ -12,6 +12,7 @@ import { | |||
12 | } from '@angular/core' | 12 | } from '@angular/core' |
13 | import { AuthService, ScreenService, ServerService, User } from '@app/core' | 13 | import { AuthService, ScreenService, ServerService, User } from '@app/core' |
14 | import { HTMLServerConfig, VideoPlaylistType, VideoPrivacy, VideoState } from '@shared/models' | 14 | import { HTMLServerConfig, VideoPlaylistType, VideoPrivacy, VideoState } from '@shared/models' |
15 | import { LinkType } from '../../../types/link.type' | ||
15 | import { ActorAvatarSize } from '../shared-actor-image/actor-avatar.component' | 16 | import { ActorAvatarSize } from '../shared-actor-image/actor-avatar.component' |
16 | import { Video } from '../shared-main' | 17 | import { Video } from '../shared-main' |
17 | import { VideoPlaylistService } from '../shared-video-playlist' | 18 | import { VideoPlaylistService } from '../shared-video-playlist' |
@@ -28,8 +29,6 @@ export type MiniatureDisplayOptions = { | |||
28 | blacklistInfo?: boolean | 29 | blacklistInfo?: boolean |
29 | nsfw?: boolean | 30 | nsfw?: boolean |
30 | } | 31 | } |
31 | export type VideoLinkType = 'internal' | 'lazy-load' | 'external' | ||
32 | |||
33 | @Component({ | 32 | @Component({ |
34 | selector: 'my-video-miniature', | 33 | selector: 'my-video-miniature', |
35 | styleUrls: [ './video-miniature.component.scss' ], | 34 | styleUrls: [ './video-miniature.component.scss' ], |
@@ -56,7 +55,7 @@ export class VideoMiniatureComponent implements OnInit { | |||
56 | 55 | ||
57 | @Input() displayAsRow = false | 56 | @Input() displayAsRow = false |
58 | 57 | ||
59 | @Input() videoLinkType: VideoLinkType = 'internal' | 58 | @Input() videoLinkType: LinkType = 'internal' |
60 | 59 | ||
61 | @Output() videoBlocked = new EventEmitter() | 60 | @Output() videoBlocked = new EventEmitter() |
62 | @Output() videoUnblocked = new EventEmitter() | 61 | @Output() videoUnblocked = new EventEmitter() |