forks/peertube
1
0
Fork 0
Code Releases Activity

Fix HTTP fallback when having videostream issues on firefox

Browse source
This commit is contained in:
Chocobozzz 2018-06-20 08:57:52 +02:00
parent 9c2e0dbfa9
commit 575712a5c9
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/src/app/videos/+video-edit/shared/video-edit.component.ts
View file

@ -101,7 +101,6 @@ export class VideoEditComponent implements OnInit {
this.videoCategories = this.serverService.getVideoCategories() this.videoCategories = this.serverService.getVideoCategories()
this.videoLicences = this.serverService.getVideoLicences() this.videoLicences = this.serverService.getVideoLicences()
this.videoLanguages = this.serverService.getVideoLanguages() this.videoLanguages = this.serverService.getVideoLanguages()
console.log(this.videoLanguages)
setTimeout(() => this.minScheduledDate = new Date(), 1000 * 60) // Update every minute setTimeout(() => this.minScheduledDate = new Date(), 1000 * 60) // Update every minute
} }

4
client/src/assets/player/video-renderer.ts
View file

@ -45,10 +45,10 @@ function renderMedia (file, elem: HTMLVideoElement, opts: RenderMediaOptions, ca
function useVideostream () { function useVideostream () {
prepareElem() prepareElem()
preparedElem.addEventListener('error', function onError () { preparedElem.addEventListener('error', function onError (err) {
preparedElem.removeEventListener('error', onError) preparedElem.removeEventListener('error', onError)
return fallbackToMediaSource() return callback(err)
}) })
preparedElem.addEventListener('loadstart', onLoadStart) preparedElem.addEventListener('loadstart', onLoadStart)
return videostream(file, preparedElem) return videostream(file, preparedElem)

2
server/helpers/custom-validators/activitypub/actor.ts
View file

@ -92,7 +92,7 @@ function isActorUpdateActivityValid (activity: any) {
} }
function normalizeActor (actor: any) { function normalizeActor (actor: any) {
if (!actor) return if (!actor || !actor.url) return
if (typeof actor.url !== 'string') { if (typeof actor.url !== 'string') {
actor.url = actor.url.href || actor.url.url actor.url = actor.url.href || actor.url.url