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

Run videojs outside angular

pull/200/head
Chocobozzz 2018-01-10 17:36:35 +01:00
parent 2ccaeeb341
commit 7ae71355c4
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
import { MetaService } from '@ngx-meta/core'
import { NotificationsService } from 'angular2-notifications'
@ -60,7 +60,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
private metaService: MetaService,
private authService: AuthService,
private notificationsService: NotificationsService,
private markdownService: MarkdownService
private markdownService: MarkdownService,
private zone: NgZone
) {}
get user () {
@ -338,10 +339,12 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.videoPlayerLoaded = true
const self = this
videojs(this.playerElement, videojsOptions, function () {
self.player = this
this.on('customError', (event, data) => {
self.handleError(data.err)
this.zone.runOutsideAngular(() => {
videojs(this.playerElement, videojsOptions, function () {
self.player = this
this.on('customError', (event, data) => {
self.handleError(data.err)
})
})
})
} else {

1
server/tests/api/server/handle-down.ts
View File

@ -133,7 +133,6 @@ describe('Test handle downs', function () {
expect(videoServer2).not.to.be.undefined
await completeVideoCheck(servers[1].url, videoServer2, checkAttributes)
})
after(async function () {