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

Defaufault sorting; playback control button feedback, fixes #299

Browse Source
This commit is contained in:
James Barnsley
2018-06-18 20:44:35 +12:00
parent 1d492bbfef
commit 3cd4316eed
14 changed files with 230 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/js/views/Artist.js
View File

@ -141,7 +141,10 @@ class Artist extends React.Component{
albums.push(this.props.albums[uri]);
}
}
albums = helpers.sortItems(albums, this.props.sort, this.props.sort_reverse);
if (this.props.sort){
albums = helpers.sortItems(albums, this.props.sort, this.props.sort_reverse);
}
if (this.props.filter){
albums = helpers.applyFilter('album_type', this.props.filter, albums);
@ -184,6 +187,10 @@ class Artist extends React.Component{
default:
var sort_options = [
{
value: null,
label: 'Default'
},
{
value: 'name',
label: 'Name'
@ -257,7 +264,7 @@ class Artist extends React.Component{
name="Sort"
value={this.props.sort}
options={sort_options}
selected_icon={this.props.sort_reverse ? 'keyboard_arrow_up' : 'keyboard_arrow_down'}
selected_icon={this.props.sort ? (this.props.sort_reverse ? 'keyboard_arrow_up' : 'keyboard_arrow_down') : null}
handleChange={value => {this.setSort(value); this.props.uiActions.hideContextMenu() }}
/>
<DropdownField
@ -351,7 +358,7 @@ const mapStateToProps = (state, ownProps) => {
local_library_artists: state.mopidy.library_artists,
albums: (state.core.albums ? state.core.albums : []),
filter: (state.ui.artist_albums_filter ? state.ui.artist_albums_filter : null),
sort: (state.ui.artist_albums_sort ? state.ui.artist_albums_sort : 'name'),
sort: (state.ui.artist_albums_sort ? state.ui.artist_albums_sort : null),
sort_reverse: (state.ui.artist_albums_sort_reverse ? true : false),
spotify_authorized: state.spotify.authorization,
mopidy_connected: state.mopidy.connected