aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/assets
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-08-07 14:01:11 +0200
committerChocobozzz <me@florianbigard.com>2020-08-07 14:01:11 +0200
commitd5cefc1fa5b961b9c6f0efb60baf876b3f453658 (patch)
treec4595d75e2840e112f2ae13dac6a309d960dfab9 /client/src/assets
parent3efa3f4d3552719ceda0b5f243a8f3dc87b29535 (diff)
parent7f90579c04383ca883083548f40782352605d778 (diff)
downloadPeerTube-d5cefc1fa5b961b9c6f0efb60baf876b3f453658.tar.gz
PeerTube-d5cefc1fa5b961b9c6f0efb60baf876b3f453658.tar.zst
PeerTube-d5cefc1fa5b961b9c6f0efb60baf876b3f453658.zip
Merge branch 'feature/e2e' into develop
Diffstat (limited to 'client/src/assets')
-rw-r--r--client/src/assets/player/playlist/playlist-menu.ts5
1 files changed, 4 insertions, 1 deletions
diff --git a/client/src/assets/player/playlist/playlist-menu.ts b/client/src/assets/player/playlist/playlist-menu.ts
index 37284fb44..a2583047b 100644
--- a/client/src/assets/player/playlist/playlist-menu.ts
+++ b/client/src/assets/player/playlist/playlist-menu.ts
@@ -65,8 +65,11 @@ class PlaylistMenu extends Component {
65 className: 'title' 65 className: 'title'
66 }) 66 })
67 67
68 const playlistChannel = options.playlist.videoChannel
68 const leftSubtitle = super.createEl('div', { 69 const leftSubtitle = super.createEl('div', {
69 innerHTML: this.player().localize('By {1}', [ options.playlist.videoChannel.displayName ]), 70 innerHTML: playlistChannel
71 ? this.player().localize('By {1}', [ playlistChannel.displayName ])
72 : '',
70 className: 'channel' 73 className: 'channel'
71 }) 74 })
72 75