All URILink and LinksSentences now define URI type
This commit is contained in:
@ -260,7 +260,7 @@ class Album extends React.Component {
|
||||
) : null}
|
||||
{album.artists && album.artists.length > 0 ? (
|
||||
<li>
|
||||
<LinksSentence items={album.artists} />
|
||||
<LinksSentence items={album.artists} type="artist" />
|
||||
</li>
|
||||
) : null}
|
||||
{album.release_date ? (
|
||||
|
||||
@ -42,7 +42,7 @@ const Artwork = ({
|
||||
<Link to="/kiosk-mode" className="thumbnail__actions__item">
|
||||
<Icon name="expand" type="fontawesome" />
|
||||
</Link>
|
||||
<URILink uri={album_uri} className="thumbnail__actions__item">
|
||||
<URILink type="album" uri={album_uri} className="thumbnail__actions__item">
|
||||
<Icon name="album" />
|
||||
</URILink>
|
||||
</Thumbnail>
|
||||
@ -176,6 +176,7 @@ class Queue extends React.Component {
|
||||
{addedFromItems[0].images && (
|
||||
<URILink
|
||||
uri={addedFromItems[0].uri}
|
||||
type={addedFromItems[0].type}
|
||||
className="current-track__added-from__thumbnail"
|
||||
>
|
||||
<Thumbnail
|
||||
@ -188,7 +189,10 @@ class Queue extends React.Component {
|
||||
)}
|
||||
<div className="current-track__added-from__text">
|
||||
{'Playing from '}
|
||||
<LinksSentence items={addedFromItems} />
|
||||
<LinksSentence
|
||||
items={addedFromItems}
|
||||
type={addedFromItems[0].type}
|
||||
/>
|
||||
{uri_type === 'radio' && (
|
||||
<span className="flag flag--blue">
|
||||
{i18n('now_playing.current_track.radio')}
|
||||
@ -270,15 +274,10 @@ class Queue extends React.Component {
|
||||
{!stream_title && !current_track && (<span>-</span>)}
|
||||
</div>
|
||||
|
||||
{
|
||||
(current_track && current_track.artists && (
|
||||
<LinksSentence
|
||||
className="current-track__artists"
|
||||
items={current_track.artists}
|
||||
/>
|
||||
))
|
||||
|| <LinksSentence className="current-track__artists" />
|
||||
}
|
||||
<LinksSentence
|
||||
className="current-track__artists"
|
||||
items={current_track ? current_track.artists : null}
|
||||
/>
|
||||
|
||||
{this.renderAddedFrom()}
|
||||
|
||||
|
||||
@ -240,7 +240,7 @@ class Track extends React.Component {
|
||||
{track.album && !track.album.uri ? track.album.name : null}
|
||||
{!track.album && <I18n path="track.unknown_album" />}
|
||||
<I18n path="common.by" />
|
||||
{track.artists && <LinksSentence items={track.artists} />}
|
||||
{track.artists && <LinksSentence items={track.artists} type="artist" />}
|
||||
</h2>
|
||||
|
||||
<ul className="details">
|
||||
|
||||
@ -30,7 +30,7 @@ const UriListItem = ({
|
||||
{item ? item.name : <span className="mid_grey-text">{uri}</span>}
|
||||
{item && item.artists && (
|
||||
<I18n path="common.by" contentAfter>
|
||||
<LinksSentence nolinks items={item.artists} />
|
||||
<LinksSentence nolinks items={item.artists} type="artist" />
|
||||
</I18n>
|
||||
)}
|
||||
<span className="mid_grey-text">{` (${type})`}</span>
|
||||
|
||||
@ -210,7 +210,11 @@ class KioskMode extends React.Component {
|
||||
{!stream_title && current_track && <span>{current_track.name}</span>}
|
||||
{!stream_title && !current_track && <span>-</span>}
|
||||
</div>
|
||||
{ current_track ? <LinksSentence nolinks items={current_track.artists} /> : <LinksSentence /> }
|
||||
<LinksSentence
|
||||
items={current_track ? current_track.artists : null}
|
||||
type="artist"
|
||||
nolinks
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user