secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of https://github.com/maxerenberg/Iris into maxerenberg-master

Browse Source
This commit is contained in:
James Barnsley
2020-11-14 21:52:42 +13:00
parent eded4a2f96 c7462e44a9
commit f59c927f87
16 changed files with 555874 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/js/views/Queue.js Executable file → Normal file
View File

@ -203,6 +203,7 @@ class Queue extends React.Component {
const {
current_track,
queue_tracks,
stream_title,
theme,
current_track_uri,
spotify_enabled,
@ -267,14 +268,18 @@ class Queue extends React.Component {
)}
</div>
{current_track ? (
<LinksSentence
className="current-track__artists"
items={current_track.artists}
/>
) : (
<LinksSentence className="current-track__artists" />
)}
{
(current_track && current_track.artists && (
<LinksSentence
className="current-track__artists"
items={current_track.artists}
/>
))
|| (stream_title && (
<span className="current-track__artists links-sentence">{stream_title}</span>
))
|| <LinksSentence className="current-track__artists" />
}
{this.renderAddedFrom()}
@ -335,6 +340,7 @@ class Queue extends React.Component {
const mapStateToProps = (state) => {
const {
current_track: core_current_track,
stream_title,
items,
queue,
queue_metadata,
@ -390,6 +396,7 @@ const mapStateToProps = (state) => {
current_track && current_track.added_from
? current_track.added_from
: null,
stream_title,
};
};