improve notification popup interactivity: read all, layout, position

[github/Chocobozzz/PeerTube.git] / client / src / app / videos / +video-watch / video-watch.component.ts

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 626d0ca07e115b3ac8bcdefb70cd633fc07d038a..134af751d4e652493dc0fc619f6bfd7b9f2e8e6a 100644 (file)
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -147,7 +147,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
     this.queryParamsSub = this.route.queryParams.subscribe(async queryParams => {
       const videoId = queryParams[ 'videoId' ]
-      if (videoId) await this.loadVideo(videoId)
+      if (videoId) this.loadVideo(videoId)
 
       const start = queryParams[ 'start' ]
       if (this.player && start) this.player.currentTime(parseInt(start, 10))
@@ -618,7 +618,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)