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

Merge branch 'release/3.2.0' into develop

pull/4048/head
Chocobozzz 2021-05-25 15:28:01 +02:00
parent 1e4d2cb5ae ceb8f32211
commit 20213fbd2a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
View File

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