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

Mergingcurrent_track and current_tracklist; Smarter reducers for UI

Browse Source
This commit is contained in:
James Barnsley
2016-11-09 13:18:03 +13:00
parent c87a7fbd17
commit 88caab6aef
24 changed files with 5712 additions and 5915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/js/views/Queue.js
View File

@ -21,22 +21,6 @@ class Queue extends React.Component{
super(props);
}
renderTrackList(){
if( this.props.mopidy && this.props.mopidy.tracks ){
return (
<TrackList
show_source_icon={true}
context="queue"
tracks={this.props.mopidy.tracks}
removeTracks={ tracks => this.removeTracks( tracks ) }
playTracks={ tracks => this.playTracks( tracks ) }
playTrack={ track => this.playTrack( track ) }
/>
);
}
return null;
}
removeTracks( tracks ){
var tlids = [];
for( var i = 0; i < tracks.length; i++ ){
@ -60,7 +44,13 @@ class Queue extends React.Component{
<FullPlayer />
<section className="list-wrapper">
{ this.renderTrackList() }
<TrackList
show_source_icon={true}
context="queue"
tracks={this.props.current_tracklist}
removeTracks={ tracks => this.removeTracks( tracks ) }
playTracks={ tracks => this.playTracks( tracks ) }
playTrack={ track => this.playTrack( track ) } />
</section>
</div>
@ -76,7 +66,9 @@ class Queue extends React.Component{
**/
const mapStateToProps = (state, ownProps) => {
return state;
return {
current_tracklist: state.ui.current_tracklist
}
}
const mapDispatchToProps = (dispatch) => {