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

2 files changed, 2 insertions, 2 deletions

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"
       ></my-global-icon>
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)