aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/videos
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/videos')
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.html6
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss3
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts4
3 files changed, 7 insertions, 6 deletions
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 7f3d1cc2e..3df5b7b19 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -9,7 +9,7 @@
9 9
10 <div id="videojs-wrapper"></div> 10 <div id="videojs-wrapper"></div>
11 11
12 <div *ngIf="playlist && video" class="playlist"> 12 <div *ngIf="playlist && video" class="playlist" myInfiniteScroller [autoInit]="true" [onItself]="true" (nearOfBottom)="onPlaylistVideosNearOfBottom()">
13 <div class="playlist-info"> 13 <div class="playlist-info">
14 <div class="playlist-display-name"> 14 <div class="playlist-display-name">
15 {{ playlist.displayName }} 15 {{ playlist.displayName }}
@@ -27,10 +27,10 @@
27 </div> 27 </div>
28 </div> 28 </div>
29 29
30 <div *ngFor="let playlistVideo of playlistVideos" myInfiniteScroller [autoInit]="true" #elem [container]="elem" (nearOfBottom)="onPlaylistVideosNearOfBottom()"> 30 <div *ngFor="let playlistVideo of playlistVideos">
31 <my-video-playlist-element-miniature 31 <my-video-playlist-element-miniature
32 [video]="playlistVideo" [playlist]="playlist" [owned]="isPlaylistOwned()" (elementRemoved)="onElementRemoved($event)" 32 [video]="playlistVideo" [playlist]="playlist" [owned]="isPlaylistOwned()" (elementRemoved)="onElementRemoved($event)"
33 [playing]="currentPlaylistPosition === playlistVideo.playlistElement.position" [accountLink]="false" 33 [playing]="currentPlaylistPosition === playlistVideo.playlistElement.position" [accountLink]="false" [position]="playlistVideo.playlistElement.position"
34 ></my-video-playlist-element-miniature> 34 ></my-video-playlist-element-miniature>
35 </div> 35 </div>
36 </div> 36 </div>
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index e1cb249ef..281b9240b 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -43,11 +43,12 @@ $other-videos-width: 260px;
43 .playlist { 43 .playlist {
44 width: 400px; 44 width: 400px;
45 height: 66vh; 45 height: 66vh;
46 background-color: #e4e4e4; 46 background-color: var(--mainBackgroundColor);
47 overflow-y: auto; 47 overflow-y: auto;
48 48
49 .playlist-info { 49 .playlist-info {
50 padding: 5px 30px; 50 padding: 5px 30px;
51 background-color: #e4e4e4;
51 52
52 .playlist-display-name { 53 .playlist-display-name {
53 font-size: 18px; 54 font-size: 18px;
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index ddd0f1766..adb728aba 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -58,7 +58,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
58 playlistVideos: Video[] = [] 58 playlistVideos: Video[] = []
59 playlistPagination: ComponentPagination = { 59 playlistPagination: ComponentPagination = {
60 currentPage: 1, 60 currentPage: 1,
61 itemsPerPage: 10, 61 itemsPerPage: 30,
62 totalItems: null 62 totalItems: null
63 } 63 }
64 noPlaylistVideos = false 64 noPlaylistVideos = false
@@ -401,7 +401,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
401 } 401 }
402 402
403 private loadPlaylistElements (redirectToFirst = false) { 403 private loadPlaylistElements (redirectToFirst = false) {
404 this.videoService.getPlaylistVideos(this.playlist.id, this.playlistPagination) 404 this.videoService.getPlaylistVideos(this.playlist.uuid, this.playlistPagination)
405 .subscribe(({ totalVideos, videos }) => { 405 .subscribe(({ totalVideos, videos }) => {
406 this.playlistVideos = this.playlistVideos.concat(videos) 406 this.playlistVideos = this.playlistVideos.concat(videos)
407 this.playlistPagination.totalItems = totalVideos 407 this.playlistPagination.totalItems = totalVideos