Fix player play exception on chromium

pull/177/head
Chocobozzz 2017-12-19 15:17:43 +01:00
parent 232f04c809
commit 85414add64
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 9 additions and 10 deletions

View File

@ -235,9 +235,7 @@ const peertubePlugin = function (options: PeertubePluginOptions) {
if (err) return handleError(err)
this.renderer = renderer
player.play()
return done()
player.play().then(done)
})
})
@ -323,10 +321,14 @@ const peertubePlugin = function (options: PeertubePluginOptions) {
player.updateVideoFile()
} else {
player.one('play', () => {
// Pause, we wait the video to load before
player.pause()
// On firefox, we need to wait to load the video before playing
if (navigator.userAgent.toLowerCase().indexOf('firefox') !== -1) {
player.pause()
player.updateVideoFile(undefined, () => player.play())
return
}
player.updateVideoFile(undefined, () => player.play())
player.updateVideoFile(undefined)
})
}

View File

@ -43,8 +43,6 @@ function isActivityPubVideoDurationValid (value: string) {
}
function isVideoTorrentObjectValid (video: any) {
console.log(video)
return video.type === 'Video' &&
isActivityPubUrlValid(video.id) &&
isVideoNameValid(video.name) &&

View File

@ -62,5 +62,5 @@ async function follow (actor: ActorModel, targetActorURL: string) {
return sendAccept(actorFollow, t)
})
logger.info('Actor %s is followed by actor %s.', actor.url, targetActorURL)
logger.info('Actor %s is followed by actor %s.', targetActorURL, actor.url)
}

View File

@ -34,7 +34,6 @@ async function checkSignature (req: Request, res: Response, next: NextFunction)
function executeIfActivityPub (fun: RequestHandler | RequestHandler[]) {
return (req: Request, res: Response, next: NextFunction) => {
const accepted = req.accepts(ACCEPT_HEADERS)
console.log(accepted)
if (accepted === false || ACTIVITY_PUB.POTENTIAL_ACCEPT_HEADERS.indexOf(accepted) === -1) {
return next()
}