diff options
Diffstat (limited to 'client/src/app')
3 files changed, 4 insertions, 3 deletions
diff --git a/client/src/app/shared/video-playlist/video-playlist-element-miniature.component.ts b/client/src/app/shared/video-playlist/video-playlist-element-miniature.component.ts index cd592eab0..bb2fe7da3 100644 --- a/client/src/app/shared/video-playlist/video-playlist-element-miniature.component.ts +++ b/client/src/app/shared/video-playlist/video-playlist-element-miniature.component.ts | |||
| @@ -86,7 +86,8 @@ export class VideoPlaylistElementMiniatureComponent implements OnInit { | |||
| 86 | return { | 86 | return { |
| 87 | videoId: this.playlistElement.video.uuid, | 87 | videoId: this.playlistElement.video.uuid, |
| 88 | start: this.playlistElement.startTimestamp, | 88 | start: this.playlistElement.startTimestamp, |
| 89 | stop: this.playlistElement.stopTimestamp | 89 | stop: this.playlistElement.stopTimestamp, |
| 90 | resume: true | ||
| 90 | } | 91 | } |
| 91 | } | 92 | } |
| 92 | 93 | ||
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 @@ | |||
| 29 | iconName="repeat" | 29 | iconName="repeat" |
| 30 | [class.active]="loopPlaylist" | 30 | [class.active]="loopPlaylist" |
| 31 | (click)="switchLoopPlaylist()" | 31 | (click)="switchLoopPlaylist()" |
| 32 | [ngbTooltip]="'Loop playlist videos'" | 32 | [ngbTooltip]="loopPlaylistSwitchText" |
| 33 | placement="bottom auto" | 33 | placement="bottom auto" |
| 34 | container="body" | 34 | container="body" |
| 35 | ></my-global-icon> | 35 | ></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 { | |||
| 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) |