diff options
| author | Rigel Kent <sendmemail@rigelk.eu> | 2019-12-18 23:39:07 +0100 |
|---|---|---|
| committer | Rigel Kent <sendmemail@rigelk.eu> | 2019-12-18 23:39:11 +0100 |
| commit | 96f6278f3e5b35d6e812176c799088f88729a0b0 (patch) | |
| tree | 6231a912cbe8b7165c72bdbad7cdba079bc0212d /client/src/app/videos/+video-watch/video-watch.component.ts | |
| parent | 9650937374f7ac9f884a95a465f8c8c8c966bf71 (diff) | |
| download | PeerTube-96f6278f3e5b35d6e812176c799088f88729a0b0.tar.gz PeerTube-96f6278f3e5b35d6e812176c799088f88729a0b0.tar.zst PeerTube-96f6278f3e5b35d6e812176c799088f88729a0b0.zip | |
respect video history on explicit playlist click
also correct font-weight for .title-page-single, and tooltip dynamic
text for playlist loop button.
fixes #1889
Diffstat (limited to 'client/src/app/videos/+video-watch/video-watch.component.ts')
| -rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.ts | 2 |
1 files changed, 1 insertions, 1 deletions
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 9eae45fed..dbd75b35a 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts | |||
| @@ -619,7 +619,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
| 619 | const { video, videoCaptions, urlOptions, user } = params | 619 | const { video, videoCaptions, urlOptions, user } = params |
| 620 | const getStartTime = () => { | 620 | const getStartTime = () => { |
| 621 | const byUrl = urlOptions.startTime !== undefined | 621 | const byUrl = urlOptions.startTime !== undefined |
| 622 | const byHistory = video.userHistory && !this.playlist | 622 | const byHistory = video.userHistory && (!this.playlist || urlOptions.resume !== undefined) |
| 623 | 623 | ||
| 624 | if (byUrl) { | 624 | if (byUrl) { |
| 625 | return timeToInt(urlOptions.startTime) | 625 | return timeToInt(urlOptions.startTime) |