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

Oversimplifying queue made identifying current track impossible; Reinstated queue as object list, merged with index for max data

Browse Source
This commit is contained in:
James Barnsley
2017-11-17 20:25:43 +13:00
parent fd3e1ce55d
commit 7aca106c74
11 changed files with 65 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/services/core/middleware.js
View File

@ -317,6 +317,7 @@ const CoreMiddleware = (function(){
type: 'TRACKS_LOADED',
tracks: [action.current_track]
});
next(action);
break;
@ -325,8 +326,7 @@ const CoreMiddleware = (function(){
type: 'TRACKS_LOADED',
tracks: action.tracks
});
action.tracks_uris = helpers.arrayOf('uri',action.tracks);
next(action);
break;

4
src/js/services/core/reducer.js
View File

@ -13,13 +13,13 @@ export default function reducer(core = {}, action){
case 'CURRENT_TRACK_LOADED':
return Object.assign({}, core, {
current_track_tlid: action.current_track_tlid,
current_track: action.current_track,
current_track_uri: action.current_track_uri
});
case 'QUEUE_LOADED':
return Object.assign({}, core, {
queue: action.tracks_uris
queue: action.tracks
});
case 'PUSHER_QUEUE_METADATA':