Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-custom-markup / custom-markup.service.ts

diff --git a/client/src/app/shared/shared-custom-markup/custom-markup.service.ts b/client/src/app/shared/shared-custom-markup/custom-markup.service.ts
index c9d33980ef466f0ac1af9ea09be3412c57270566..a959b336d18b555619dbdddbf9b29b85cacefbd1 100644 (file)
--- a/client/src/app/shared/shared-custom-markup/custom-markup.service.ts
+++ b/client/src/app/shared/shared-custom-markup/custom-markup.service.ts
@@ -1,4 +1,4 @@
-import { first } from 'rxjs/operators'
+import { firstValueFrom } from 'rxjs'
 import { ComponentRef, Injectable } from '@angular/core'
 import { MarkdownService } from '@app/core'
 import {
@@ -7,7 +7,6 @@ import {
   ContainerMarkupData,
   EmbedMarkupData,
   PlaylistMiniatureMarkupData,
-  VideoFilter,
   VideoMiniatureMarkupData,
   VideosListMarkupData
 } from '@shared/models'
@@ -85,7 +84,7 @@ export class CustomMarkupService {
             const component = this.execAngularBuilder(selector, e)
 
             if (component.instance.loaded) {
-              const p = component.instance.loaded.pipe(first()).toPromise()
+              const p = firstValueFrom(component.instance.loaded)
               loadedPromises.push(p)
             }
 
@@ -193,7 +192,7 @@ export class CustomMarkupService {
 
       isLive: this.buildBoolean(data.isLive),
 
-      filter: this.buildBoolean(data.onlyLocal) ? 'local' as VideoFilter : undefined
+      isLocal: this.buildBoolean(data.onlyLocal) ? true : undefined
     }
 
     this.dynamicElementService.setModel(component, model)
@@ -217,6 +216,8 @@ export class CustomMarkupService {
 
     root.classList.add('peertube-container', layoutClass)
 
+    root.style.justifyContent = data.justifyContent || 'space-between'
+
     if (data.width) {
       root.setAttribute('width', data.width)
     }