Merge branch 'release/3.2.0' into develop

pull/4048/head
Chocobozzz 2021-05-25 15:28:01 +02:00
commit 20213fbd2a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 3 additions and 2 deletions

View File

@ -674,7 +674,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.player.one('ended', () => {
if (this.video.isLive) {
this.video.state.id = VideoState.LIVE_ENDED
this.zone.run(() => this.video.state.id = VideoState.LIVE_ENDED)
}
})

View File

@ -3,7 +3,8 @@ import { PluginElementPlaceholder } from '@shared/models'
@Component({
selector: 'my-plugin-placeholder',
template: '<div [id]="getId()"></div>'
template: '<div [id]="getId()"></div>',
styles: [ 'div { height: 100%; }' ]
})
export class PluginPlaceholderComponent {