import { AuthService, Notifier, ServerService } from '@app/core'
import { Video } from '@app/shared/shared-main'
import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { ServerConfig, VideoPlaylistElementType, VideoPlaylistElementUpdate } from '@shared/models'
-import { secondsToTime } from '../../../assets/player/utils'
+import { secondsToTime } from '@shared/core-utils'
+import { HTMLServerConfig, VideoPlaylistElementType, VideoPlaylistElementUpdate } from '@shared/models'
import { VideoPlaylistElement } from './video-playlist-element.model'
import { VideoPlaylist } from './video-playlist.model'
import { VideoPlaylistService } from './video-playlist.service'
stopTimestamp: number
} = {} as any
- private serverConfig: ServerConfig
+ private serverConfig: HTMLServerConfig
constructor (
private authService: AuthService,
private serverService: ServerService,
private notifier: Notifier,
- private i18n: I18n,
private videoPlaylistService: VideoPlaylistService,
private cdr: ChangeDetectorRef
) {}
ngOnInit (): void {
- this.serverConfig = this.serverService.getTmpConfig()
- this.serverService.getConfig()
- .subscribe(config => {
- this.serverConfig = config
- this.cdr.detectChanges()
- })
+ this.serverConfig = this.serverService.getHTMLConfig()
}
isUnavailable (e: VideoPlaylistElement) {
buildRouterLink () {
if (!this.playlist) return null
- return [ '/videos/watch/playlist', this.playlist.uuid ]
+ return VideoPlaylist.buildWatchUrl(this.playlist)
}
buildRouterQuery () {
if (!this.playlistElement || !this.playlistElement.video) return {}
return {
- videoId: this.playlistElement.video.uuid,
+ playlistPosition: this.playlistElement.position,
start: this.playlistElement.startTimestamp,
stop: this.playlistElement.stopTimestamp,
resume: true
const videoId = this.playlistElement.video ? this.playlistElement.video.id : undefined
this.videoPlaylistService.removeVideoFromPlaylist(this.playlist.id, playlistElement.id, videoId)
- .subscribe(
- () => {
- this.notifier.success(this.i18n('Video removed from {{name}}', { name: this.playlist.displayName }))
-
+ .subscribe({
+ next: () => {
+ this.notifier.success($localize`Video removed from ${this.playlist.displayName}`)
this.elementRemoved.emit(playlistElement)
},
- err => this.notifier.error(err.message)
- )
+ error: err => this.notifier.error(err.message)
+ })
this.moreDropdown.close()
}
body.stopTimestamp = this.timestampOptions.stopTimestampEnabled ? this.timestampOptions.stopTimestamp : null
this.videoPlaylistService.updateVideoOfPlaylist(this.playlist.id, playlistElement.id, body, this.playlistElement.video.id)
- .subscribe(
- () => {
- this.notifier.success(this.i18n('Timestamps updated'))
+ .subscribe({
+ next: () => {
+ this.notifier.success($localize`Timestamps updated`)
playlistElement.startTimestamp = body.startTimestamp
playlistElement.stopTimestamp = body.stopTimestamp
this.cdr.detectChanges()
},
- err => this.notifier.error(err.message)
- )
+ error: err => this.notifier.error(err.message)
+ })
this.moreDropdown.close()
}
if (start === null && stop === null) return ''
- if (start !== null && stop === null) return this.i18n('Starts at ') + startFormatted
- if (start === null && stop !== null) return this.i18n('Stops at ') + stopFormatted
+ if (start !== null && stop === null) return $localize`Starts at ` + startFormatted
+ if (start === null && stop !== null) return $localize`Stops at ` + stopFormatted
- return this.i18n('Starts at ') + startFormatted + this.i18n(' and stops at ') + stopFormatted
+ return $localize`Starts at ` + startFormatted + $localize` and stops at ` + stopFormatted
}
onDropdownOpenChange () {