From 96f6278f3e5b35d6e812176c799088f88729a0b0 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Wed, 18 Dec 2019 23:39:07 +0100 Subject: 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 --- client/src/app/videos/+video-watch/video-watch-playlist.component.html | 2 +- client/src/app/videos/+video-watch/video-watch.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'client/src/app/videos/+video-watch') diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.html b/client/src/app/videos/+video-watch/video-watch-playlist.component.html index a04081d35..d43dcec93 100644 --- a/client/src/app/videos/+video-watch/video-watch-playlist.component.html +++ b/client/src/app/videos/+video-watch/video-watch-playlist.component.html @@ -29,7 +29,7 @@ iconName="repeat" [class.active]="loopPlaylist" (click)="switchLoopPlaylist()" - [ngbTooltip]="'Loop playlist videos'" + [ngbTooltip]="loopPlaylistSwitchText" placement="bottom auto" container="body" > 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 { const { video, videoCaptions, urlOptions, user } = params const getStartTime = () => { const byUrl = urlOptions.startTime !== undefined - const byHistory = video.userHistory && !this.playlist + const byHistory = video.userHistory && (!this.playlist || urlOptions.resume !== undefined) if (byUrl) { return timeToInt(urlOptions.startTime) -- cgit v1.2.3