aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-05-25 18:32:53 +0200
committerChocobozzz <me@florianbigard.com>2018-05-25 18:32:53 +0200
commit74af5145f210e7e23d40b22c9ee3d968723d2595 (patch)
treed8910eeb89d75e36ecd5fd4f6090ec643d13a099 /client/src/app/shared
parent407eab9c954a99fa8b65c637e4b1a37920fd849e (diff)
downloadPeerTube-74af5145f210e7e23d40b22c9ee3d968723d2595.tar.gz
PeerTube-74af5145f210e7e23d40b22c9ee3d968723d2595.tar.zst
PeerTube-74af5145f210e7e23d40b22c9ee3d968723d2595.zip
Video support field inherits channel support field
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/forms/markdown-textarea.component.scss1
-rw-r--r--client/src/app/shared/misc/utils.ts4
2 files changed, 3 insertions, 2 deletions
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 @@
13 .previews { 13 .previews {
14 max-height: 150px; 14 max-height: 150px;
15 overflow-y: auto; 15 overflow-y: auto;
16 flex-grow: 1;
16 } 17 }
17 18
18 /deep/ { 19 /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) {
17 return decodeURIComponent(results[2].replace(/\+/g, ' ')) 17 return decodeURIComponent(results[2].replace(/\+/g, ' '))
18} 18}
19 19
20function populateAsyncUserVideoChannels (authService: AuthService, channel: any[]) { 20function populateAsyncUserVideoChannels (authService: AuthService, channel: { id: number, label: string, support: string }[]) {
21 return new Promise(res => { 21 return new Promise(res => {
22 authService.userInformationLoaded 22 authService.userInformationLoaded
23 .subscribe( 23 .subscribe(
@@ -28,7 +28,7 @@ function populateAsyncUserVideoChannels (authService: AuthService, channel: any[
28 const videoChannels = user.videoChannels 28 const videoChannels = user.videoChannels
29 if (Array.isArray(videoChannels) === false) return 29 if (Array.isArray(videoChannels) === false) return
30 30
31 videoChannels.forEach(c => channel.push({ id: c.id, label: c.displayName })) 31 videoChannels.forEach(c => channel.push({ id: c.id, label: c.displayName, support: c.support }))
32 32
33 return res() 33 return res()
34 } 34 }