OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Add ability to set subtitle in URL in watch page

pull/1498/head
Chocobozzz 2018-12-17 14:22:36 +01:00
parent 3b019808ef
commit 1b04f19c48
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/app/videos/+video-watch/video-watch.component.ts
View File

@ -118,7 +118,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
) )
.subscribe(([ video, captionsResult ]) => { .subscribe(([ video, captionsResult ]) => {
const startTime = this.route.snapshot.queryParams.start const startTime = this.route.snapshot.queryParams.start
this.onVideoFetched(video, captionsResult.data, startTime) const subtitle = this.route.snapshot.queryParams.subtitle
this.onVideoFetched(video, captionsResult.data, { startTime, subtitle })
.catch(err => this.handleError(err)) .catch(err => this.handleError(err))
}) })
}) })
@ -371,7 +373,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
) )
} }
private async onVideoFetched (video: VideoDetails, videoCaptions: VideoCaption[], startTimeFromUrl: number) { private async onVideoFetched (video: VideoDetails, videoCaptions: VideoCaption[], urlOptions: { startTime: number, subtitle: string }) {
this.video = video this.video = video
// Re init attributes // Re init attributes
@ -379,7 +381,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.completeDescriptionShown = false this.completeDescriptionShown = false
this.remoteServerDown = false this.remoteServerDown = false
let startTime = startTimeFromUrl || (this.video.userHistory ? this.video.userHistory.currentTime : 0) let startTime = urlOptions.startTime || (this.video.userHistory ? this.video.userHistory.currentTime : 0)
// Don't start the video if we are at the end // Don't start the video if we are at the end
if (this.video.duration - startTime <= 1) startTime = 0 if (this.video.duration - startTime <= 1) startTime = 0
@ -419,6 +421,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
peertubeLink: false, peertubeLink: false,
poster: this.video.previewUrl, poster: this.video.previewUrl,
startTime, startTime,
subtitle: urlOptions.subtitle,
theaterMode: true, theaterMode: true,
language: this.localeId, language: this.localeId,