diff options
author | Chocobozzz <me@florianbigard.com> | 2020-08-19 09:21:46 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-08-19 11:30:21 +0200 |
commit | d142c7b9c01735ecebc3511072c0e722ce2edc1b (patch) | |
tree | 5dd57fb6ffea64a65528113c332ce7de7ae3563f /client/src/app/shared/shared-main | |
parent | 3c6a44a18175b85d2a3e0b7c3e975718833e5345 (diff) | |
download | PeerTube-d142c7b9c01735ecebc3511072c0e722ce2edc1b.tar.gz PeerTube-d142c7b9c01735ecebc3511072c0e722ce2edc1b.tar.zst PeerTube-d142c7b9c01735ecebc3511072c0e722ce2edc1b.zip |
Use playlistPosition for playlists instead of videoId
Diffstat (limited to 'client/src/app/shared/shared-main')
-rw-r--r-- | client/src/app/shared/shared-main/angular/infinite-scroller.directive.ts | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/src/app/shared/shared-main/angular/infinite-scroller.directive.ts b/client/src/app/shared/shared-main/angular/infinite-scroller.directive.ts index f09c3d1fc..d2cf53227 100644 --- a/client/src/app/shared/shared-main/angular/infinite-scroller.directive.ts +++ b/client/src/app/shared/shared-main/angular/infinite-scroller.directive.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { fromEvent, Observable, Subscription } from 'rxjs' | ||
1 | import { distinctUntilChanged, filter, map, share, startWith, throttleTime } from 'rxjs/operators' | 2 | import { distinctUntilChanged, filter, map, share, startWith, throttleTime } from 'rxjs/operators' |
2 | import { AfterContentChecked, Directive, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core' | 3 | import { AfterContentChecked, Directive, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core' |
3 | import { fromEvent, Observable, Subscription } from 'rxjs' | ||
4 | 4 | ||
5 | @Directive({ | 5 | @Directive({ |
6 | selector: '[myInfiniteScroller]' | 6 | selector: '[myInfiniteScroller]' |
@@ -80,7 +80,9 @@ export class InfiniteScrollerDirective implements OnInit, OnDestroy, AfterConten | |||
80 | } | 80 | } |
81 | 81 | ||
82 | private getMaximumScroll () { | 82 | private getMaximumScroll () { |
83 | return this.container.scrollHeight - window.innerHeight | 83 | const elementHeight = this.onItself ? this.container.clientHeight : window.innerHeight |
84 | |||
85 | return this.container.scrollHeight - elementHeight | ||
84 | } | 86 | } |
85 | 87 | ||
86 | private hasScroll () { | 88 | private hasScroll () { |