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

Fix socket io messages angular changes

pull/3388/head
Chocobozzz 2020-12-01 15:02:31 +01:00
parent a7299d9d85
commit 15feebd97a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/e2e/src/po/player.po.ts
View File

@ -17,7 +17,7 @@ export class PlayerPage {
}
waitUntilPlayerWrapper () {
const elem = element(by.css('#video-wrapper'))
const elem = element(by.css('#placeholder-preview'))
return browser.wait(browser.ExpectedConditions.presenceOf(elem))
}

12
client/src/app/core/notification/peertube-socket.service.ts
View File

@ -53,13 +53,14 @@ export class PeerTubeSocket {
await this.importIOIfNeeded()
// Prevent protractor issues https://github.com/angular/angular/issues/11853
this.ngZone.runOutsideAngular(() => {
this.notificationSocket = this.io(environment.apiUrl + '/user-notifications', {
query: { accessToken: this.auth.getAccessToken() }
})
this.notificationSocket.on('new-notification', (n: UserNotificationServer) => this.dispatchNotificationEvent('new', n))
})
this.notificationSocket.on('new-notification', (n: UserNotificationServer) => this.dispatchNotificationEvent('new', n))
}
private async initLiveVideosSocket () {
@ -67,12 +68,13 @@ export class PeerTubeSocket {
await this.importIOIfNeeded()
// Prevent protractor issues https://github.com/angular/angular/issues/11853
this.ngZone.runOutsideAngular(() => {
this.liveVideosSocket = this.io(environment.apiUrl + '/live-videos')
const type: LiveVideoEventType = 'state-change'
this.liveVideosSocket.on(type, (payload: LiveVideoEventPayload) => this.dispatchLiveVideoEvent(type, payload))
})
const type: LiveVideoEventType = 'state-change'
this.liveVideosSocket.on(type, (payload: LiveVideoEventPayload) => this.dispatchLiveVideoEvent(type, payload))
}
private async importIOIfNeeded () {