From 74af5145f210e7e23d40b22c9ee3d968723d2595 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 25 May 2018 18:32:53 +0200 Subject: Video support field inherits channel support field --- client/src/app/shared/forms/markdown-textarea.component.scss | 1 + client/src/app/shared/misc/utils.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'client/src/app/shared') diff --git a/client/src/app/shared/forms/markdown-textarea.component.scss b/client/src/app/shared/forms/markdown-textarea.component.scss index 9c92a67d9..118b38b91 100644 --- a/client/src/app/shared/forms/markdown-textarea.component.scss +++ b/client/src/app/shared/forms/markdown-textarea.component.scss @@ -13,6 +13,7 @@ .previews { max-height: 150px; overflow-y: auto; + flex-grow: 1; } /deep/ { diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts index 727e33935..11933e90b 100644 --- a/client/src/app/shared/misc/utils.ts +++ b/client/src/app/shared/misc/utils.ts @@ -17,7 +17,7 @@ function getParameterByName (name: string, url: string) { return decodeURIComponent(results[2].replace(/\+/g, ' ')) } -function populateAsyncUserVideoChannels (authService: AuthService, channel: any[]) { +function populateAsyncUserVideoChannels (authService: AuthService, channel: { id: number, label: string, support: string }[]) { return new Promise(res => { authService.userInformationLoaded .subscribe( @@ -28,7 +28,7 @@ function populateAsyncUserVideoChannels (authService: AuthService, channel: any[ const videoChannels = user.videoChannels if (Array.isArray(videoChannels) === false) return - videoChannels.forEach(c => channel.push({ id: c.id, label: c.displayName })) + videoChannels.forEach(c => channel.push({ id: c.id, label: c.displayName, support: c.support })) return res() } -- cgit v1.2.3