From ad453580b20056fd80b3245d4db554f5ca1a5e29 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 2 Aug 2019 14:49:25 +0200 Subject: Fix infinite scroll on big screens --- .../my-account-video-playlists.component.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.ts') diff --git a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.ts b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.ts index e30656b92..0c4e4b0d6 100644 --- a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.ts +++ b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.ts @@ -9,6 +9,7 @@ import { VideoPlaylist } from '@app/shared/video-playlist/video-playlist.model' import { ComponentPagination } from '@app/shared/rest/component-pagination.model' import { VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.service' import { VideoPlaylistType } from '@shared/models' +import { Subject } from 'rxjs' @Component({ selector: 'my-account-video-playlists', @@ -20,10 +21,12 @@ export class MyAccountVideoPlaylistsComponent implements OnInit { pagination: ComponentPagination = { currentPage: 1, - itemsPerPage: 10, + itemsPerPage: 5, totalItems: null } + onDataSubject = new Subject() + private user: User constructor ( @@ -78,11 +81,15 @@ export class MyAccountVideoPlaylistsComponent implements OnInit { } private loadVideoPlaylists () { + const playlistsObservable = this.videoPlaylistService.listAccountPlaylists(this.user.account, this.pagination, '-updatedAt') + this.authService.userInformationLoaded - .pipe(flatMap(() => this.videoPlaylistService.listAccountPlaylists(this.user.account, '-updatedAt'))) + .pipe(flatMap(() => playlistsObservable)) .subscribe(res => { this.videoPlaylists = this.videoPlaylists.concat(res.data) this.pagination.totalItems = res.total + + this.onDataSubject.next(res.data) }) } } -- cgit v1.2.3