aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2019-12-18 23:39:07 +0100
committerRigel Kent <sendmemail@rigelk.eu>2019-12-18 23:39:11 +0100
commit96f6278f3e5b35d6e812176c799088f88729a0b0 (patch)
tree6231a912cbe8b7165c72bdbad7cdba079bc0212d /client/src/app
parent9650937374f7ac9f884a95a465f8c8c8c966bf71 (diff)
downloadPeerTube-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')
-rw-r--r--client/src/app/shared/video-playlist/video-playlist-element-miniature.component.ts3
-rw-r--r--client/src/app/videos/+video-watch/video-watch-playlist.component.html2
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts2
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)