aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-25 15:28:01 +0200
committerChocobozzz <me@florianbigard.com>2021-05-25 15:28:01 +0200
commit20213fbd2a366dffc35aa7dddad71323893f8d62 (patch)
tree473f5da764f8079ec860f8054b31c1b9a7936e81
parent1e4d2cb5aef11898585fae4053da4ebd0a69b480 (diff)
parentceb8f322118b24508abc6dd0bc6813a43610eff3 (diff)
downloadPeerTube-20213fbd2a366dffc35aa7dddad71323893f8d62.tar.gz
PeerTube-20213fbd2a366dffc35aa7dddad71323893f8d62.tar.zst
PeerTube-20213fbd2a366dffc35aa7dddad71323893f8d62.zip
Merge branch 'release/3.2.0' into develop
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.ts2
-rw-r--r--client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts3
2 files changed, 3 insertions, 2 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 1c510d6b0..116139d47 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -674,7 +674,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
674 674
675 this.player.one('ended', () => { 675 this.player.one('ended', () => {
676 if (this.video.isLive) { 676 if (this.video.isLive) {
677 this.video.state.id = VideoState.LIVE_ENDED 677 this.zone.run(() => this.video.state.id = VideoState.LIVE_ENDED)
678 } 678 }
679 }) 679 })
680 680
diff --git a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
index 93ba9fb9b..4d5381e8d 100644
--- a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
+++ b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
@@ -3,7 +3,8 @@ import { PluginElementPlaceholder } from '@shared/models'
3 3
4@Component({ 4@Component({
5 selector: 'my-plugin-placeholder', 5 selector: 'my-plugin-placeholder',
6 template: '<div [id]="getId()"></div>' 6 template: '<div [id]="getId()"></div>',
7 styles: [ 'div { height: 100%; }' ]
7}) 8})
8 9
9export class PluginPlaceholderComponent { 10export class PluginPlaceholderComponent {