aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared/video
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-04-05 14:16:48 +0200
committerChocobozzz <me@florianbigard.com>2019-04-05 14:16:48 +0200
commit8dfceec44a5eec8b0190d1d5076aab0f03a0cb52 (patch)
tree70ff676157240702a2013f2f6d705bfc342a8a81 /client/src/app/shared/video
parent3a0fb65c61f80b510bce979a45d59d17948745e8 (diff)
downloadPeerTube-8dfceec44a5eec8b0190d1d5076aab0f03a0cb52.tar.gz
PeerTube-8dfceec44a5eec8b0190d1d5076aab0f03a0cb52.tar.zst
PeerTube-8dfceec44a5eec8b0190d1d5076aab0f03a0cb52.zip
video add to playlist component -> onpush strategy
Diffstat (limited to 'client/src/app/shared/video')
-rw-r--r--client/src/app/shared/video/modals/video-download.component.html2
-rw-r--r--client/src/app/shared/video/modals/video-download.component.ts2
-rw-r--r--client/src/app/shared/video/video-actions-dropdown.component.ts2
-rw-r--r--client/src/app/shared/video/video-miniature.component.scss6
-rw-r--r--client/src/app/shared/video/video-miniature.component.ts3
5 files changed, 11 insertions, 4 deletions
diff --git a/client/src/app/shared/video/modals/video-download.component.html b/client/src/app/shared/video/modals/video-download.component.html
index 2bb5d6d37..dd01c1388 100644
--- a/client/src/app/shared/video/modals/video-download.component.html
+++ b/client/src/app/shared/video/modals/video-download.component.html
@@ -9,7 +9,7 @@
9 <div class="input-group input-group-sm"> 9 <div class="input-group input-group-sm">
10 <div class="input-group-prepend peertube-select-container"> 10 <div class="input-group-prepend peertube-select-container">
11 <select [(ngModel)]="resolutionId"> 11 <select [(ngModel)]="resolutionId">
12 <option *ngFor="let file of video.files" [value]="file.resolution.id">{{ file.resolution.label }}</option> 12 <option *ngFor="let file of video?.files" [value]="file.resolution.id">{{ file.resolution.label }}</option>
13 </select> 13 </select>
14 </div> 14 </div>
15 <input #urlInput (click)="urlInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getLink()" /> 15 <input #urlInput (click)="urlInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getLink()" />
diff --git a/client/src/app/shared/video/modals/video-download.component.ts b/client/src/app/shared/video/modals/video-download.component.ts
index 64aaeb3c8..d6d10d29e 100644
--- a/client/src/app/shared/video/modals/video-download.component.ts
+++ b/client/src/app/shared/video/modals/video-download.component.ts
@@ -15,7 +15,7 @@ export class VideoDownloadComponent {
15 downloadType: 'direct' | 'torrent' | 'magnet' = 'torrent' 15 downloadType: 'direct' | 'torrent' | 'magnet' = 'torrent'
16 resolutionId: number | string = -1 16 resolutionId: number | string = -1
17 17
18 private video: VideoDetails 18 video: VideoDetails
19 19
20 constructor ( 20 constructor (
21 private notifier: Notifier, 21 private notifier: Notifier,
diff --git a/client/src/app/shared/video/video-actions-dropdown.component.ts b/client/src/app/shared/video/video-actions-dropdown.component.ts
index 90bdf7df8..787ef1188 100644
--- a/client/src/app/shared/video/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/video/video-actions-dropdown.component.ts
@@ -46,7 +46,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
46 delete: true, 46 delete: true,
47 report: true 47 report: true
48 } 48 }
49 @Input() placement: string = 'left' 49 @Input() placement = 'left'
50 50
51 @Input() label: string 51 @Input() label: string
52 52
diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss
index 0d4e59c2a..fa2739f00 100644
--- a/client/src/app/shared/video/video-miniature.component.scss
+++ b/client/src/app/shared/video/video-miniature.component.scss
@@ -99,6 +99,7 @@
99 99
100 .video-miniature-information { 100 .video-miniature-information {
101 width: auto; 101 width: auto;
102 min-width: 500px;
102 103
103 .video-miniature-name { 104 .video-miniature-name {
104 @include ellipsis-multiline(1.3em, 2); 105 @include ellipsis-multiline(1.3em, 2);
@@ -111,6 +112,7 @@
111 .video-miniature-account, 112 .video-miniature-account,
112 .video-miniature-channel { 113 .video-miniature-channel {
113 font-size: 14px; 114 font-size: 14px;
115 width: fit-content;
114 } 116 }
115 117
116 .video-info-privacy { 118 .video-info-privacy {
@@ -134,6 +136,10 @@
134 my-video-thumbnail { 136 my-video-thumbnail {
135 margin-right: 0; 137 margin-right: 0;
136 } 138 }
139
140 .video-miniature-information {
141 min-width: initial;
142 }
137 } 143 }
138 } 144 }
139} 145}
diff --git a/client/src/app/shared/video/video-miniature.component.ts b/client/src/app/shared/video/video-miniature.component.ts
index e3552abba..e32b8cbc5 100644
--- a/client/src/app/shared/video/video-miniature.component.ts
+++ b/client/src/app/shared/video/video-miniature.component.ts
@@ -72,7 +72,8 @@ export class VideoMiniatureComponent implements OnInit {
72 ngOnInit () { 72 ngOnInit () {
73 this.setUpBy() 73 this.setUpBy()
74 74
75 if (this.screenService.isInSmallView()) { 75 // We rely on mouseenter to lazy load actions
76 if (this.screenService.isInTouchScreen()) {
76 this.showActions = true 77 this.showActions = true
77 } 78 }
78 } 79 }