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
This commit is contained in:
parent
9650937374
commit
96f6278f3e
|
@ -86,7 +86,8 @@ export class VideoPlaylistElementMiniatureComponent implements OnInit {
|
|||
return {
|
||||
videoId: this.playlistElement.video.uuid,
|
||||
start: this.playlistElement.startTimestamp,
|
||||
stop: this.playlistElement.stopTimestamp
|
||||
stop: this.playlistElement.stopTimestamp,
|
||||
resume: true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -43,7 +43,7 @@ class PauseBezel extends Component {
|
|||
this.options_ = options
|
||||
|
||||
player.on('pause', (_: any) => {
|
||||
if (player.seeking()) return
|
||||
if (player.seeking() || player.ended()) return
|
||||
this.container.innerHTML = getPauseBezel()
|
||||
this.showBezel()
|
||||
})
|
||||
|
|
|
@ -52,6 +52,7 @@ export interface CustomizationOptions {
|
|||
muted?: boolean
|
||||
loop?: boolean
|
||||
subtitle?: string
|
||||
resume?: string
|
||||
|
||||
peertubeLink: boolean
|
||||
}
|
||||
|
|
|
@ -142,12 +142,12 @@ label {
|
|||
@include disable-default-a-behaviour;
|
||||
|
||||
&.active, &.title-page-single {
|
||||
font-weight: $font-bold;
|
||||
margin-top: 30px;
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
&.active {
|
||||
font-weight: $font-bold;
|
||||
border-bottom: 2px solid var(--mainColor);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue