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

URILink for encoding all URIs; fixes #220; current_track now just a URI

Browse Source
This commit is contained in:
James Barnsley
2017-10-27 10:51:48 +13:00
parent a0a674d606
commit e93751a702
22 changed files with 252 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,12 +26,17 @@ export default function reducer(core = {}, action){
var metadata = {}
}
var current_tlid = null;
if (core.current_track && core.tracks && core.tracks[core.current_track] !== undefined && core.tracks[core.current_track].tlid !== undefined){
current_tlid = core.tracks[core.current_track].tlid;
}
var track = Object.assign(
{},
tltrack,
metadata,
{
playing: (core.current_track && tltrack.tlid == core.current_track.tlid )
playing: (tltrack.tlid == current_tlid)
})
tracklist.push(track)
}
@ -53,17 +58,9 @@ export default function reducer(core = {}, action){
)
}
var current_track = Object.assign(
{},
action.data.track,
{
tlid: action.data.tlid
}
)
return Object.assign({}, core, {
current_tracklist: current_tracklist,
current_track: current_track
current_track: action.data.track.uri
});
case 'TRACK_LOADED':