Merging from PR #588, fixes #627 and #582

This commit is contained in:
James Barnsley
2020-11-14 22:19:48 +13:00
parent e0e9c70769
commit b614b4a5a4
12 changed files with 212 additions and 555839 deletions

View File

@ -259,13 +259,15 @@ class Queue extends React.Component {
/>
<div className="current-track__details">
<div className="current-track__title">
{current_track ? (
{stream_title && (
<span>{stream_title}</span>
)}
{!stream_title && current_track && (
<URILink type="track" uri={current_track.uri}>
{current_track.name}
</URILink>
) : (
<span>-</span>
)}
{!stream_title && !current_track && (<span>-</span>)}
</div>
{
@ -275,9 +277,6 @@ class Queue extends React.Component {
items={current_track.artists}
/>
))
|| (stream_title && (
<span className="current-track__artists links-sentence">{stream_title}</span>
))
|| <LinksSentence className="current-track__artists" />
}