From: Chocobozzz <me@florianbigard.com>
Date: Wed, 21 Mar 2018 16:28:15 +0000 (+0100)
Subject: Fix pagination when videos take all the width
X-Git-Tag: v1.0.0-beta.2~69
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=1ff8d7d6314b9c6724900d1302c354d128c5d25b;hp=bffbebbe6b33ce306e7ec1b6051f0e51521c0440;p=github%2FChocobozzz%2FPeerTube.git

Fix pagination when videos take all the width
---

diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html
index fb7f86852..94a38019d 100644
--- a/client/src/app/shared/video/abstract-video-list.html
+++ b/client/src/app/shared/video/abstract-video-list.html
@@ -9,7 +9,7 @@
     myInfiniteScroller
     [pageHeight]="pageHeight"
     (nearOfTop)="onNearOfTop()" (nearOfBottom)="onNearOfBottom()" (pageChanged)="onPageChanged($event)"
-    class="videos" #videoElement
+    class="videos" #videosElement
   >
     <div *ngFor="let videos of videoPages" class="videos-page">
       <my-video-miniature
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts
index 4a220c93d..c3543cfaa 100644
--- a/client/src/app/shared/video/abstract-video-list.ts
+++ b/client/src/app/shared/video/abstract-video-list.ts
@@ -15,7 +15,7 @@ import { Video } from './video.model'
 export abstract class AbstractVideoList implements OnInit, OnDestroy {
   private static LINES_PER_PAGE = 3
 
-  @ViewChild('videoElement') videosElement: ElementRef
+  @ViewChild('videosElement') videosElement: ElementRef
   @ViewChild(InfiniteScrollerDirective) infiniteScroller: InfiniteScrollerDirective
 
   pagination: ComponentPagination = {
@@ -183,6 +183,8 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
 
       // Video takes all the width
       this.videoWidth = -1
+      // Same ratios than base width/height
+      this.videoHeight = this.videosElement.nativeElement.offsetWidth * (this.baseVideoHeight / this.baseVideoWidth)
       this.pageHeight = this.pagination.itemsPerPage * this.videoHeight
     } else {
       this.videoWidth = this.baseVideoWidth