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

Source icon reinstated for search results; Playlists without descriptions don't load - fixed

Browse Source
This commit is contained in:
James Barnsley
2017-03-23 11:51:04 +13:00
parent 023b92c929
commit 017a7ccd86
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/components/Track.js
View File

@ -40,7 +40,7 @@ export default class Track extends React.Component{
if( typeof(track.selected) !== 'undefined' && track.selected ) className += ' selected';
if( typeof(track.type) !== 'undefined' ) className += ' '+track.type;
if( track.playing ) className += ' playing';
var album = '-'
if( track.album ){
if( track.album.uri ){
@ -136,6 +136,7 @@ export default class Track extends React.Component{
{ this.props.track.selected ? <FontAwesome name="check" className="select-state" fixedWidth /> : null }
{ this.props.track.playing ? <FontAwesome name="play" className="play-state" fixedWidth /> : null }
{ track_columns }
{ this.props.show_source_icon ? <FontAwesome name={helpers.sourceIcon(track.uri)} className="source" fixedWidth /> : null }
</div>
);
}

2
src/js/components/TrackList.js
View File

@ -322,7 +322,7 @@ class TrackList extends React.Component{
this.state.tracks.map(
(track, index) => {
return <Track
show_source_icon={ this.props.show_source_icon }
show_source_icon={this.props.show_source_icon}
key={track.key}
track={track}
context={this.props.context}

9
src/js/services/spotify/actions.js
View File

@ -906,9 +906,12 @@ export function getPlaylist( uri ){
.then( response => {
// convert links in description
var description = response.description
description = description.split('<a href="spotify:artist:').join('<a href="#'+global.baseURL+'artist/spotify:artist:')
description = description.split('<a href="spotify:album:').join('<a href="#'+global.baseURL+'album/spotify:album:')
var description = null
if (response.description){
description = response.description
description = description.split('<a href="spotify:artist:').join('<a href="#'+global.baseURL+'artist/spotify:artist:')
description = description.split('<a href="spotify:album:').join('<a href="#'+global.baseURL+'album/spotify:album:')
}
var playlist = Object.assign(
{},

7
src/scss/components/_lists.scss
View File

@ -35,6 +35,13 @@
border-top: 0;
padding-bottom: 2px;
}
.source {
color: $mid_grey;
position: absolute;
top: 14px;
right: 12px;
}
}
&.track-list .list-item {