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

Tweaking actions for queue tracks

Browse Source
This commit is contained in:
James Barnsley
2018-09-06 17:00:55 +12:00
parent 6616bd9c3d
commit 2beb9e9b38
4 changed files with 13968 additions and 10667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24610
mopidy_iris/static/app.js
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/index.html
View File

@ -98,7 +98,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1536134952";
var build = "1536208591";
var version = "3.25.1";
// Construct the script tag

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

@ -486,17 +486,19 @@ const CoreMiddleware = (function(){
* Index actions
* These modify our asset indexes, which are used globally
**/
/*
case 'CURRENT_TRACK_LOADED':
store.dispatch(coreActions.trackLoaded(action.track));
next(action);
break;
/*
case 'QUEUE_LOADED':
store.dispatch(coreActions.tracksLoaded(action.tracks));
next(action);
break;*/
break;
*/
case 'CURRENT_TRACK_LOADED':
case 'QUEUE_LOADED':
case 'TRACKS_LOADED':
var tracks_index = Object.assign({}, core.tracks);
@ -506,7 +508,13 @@ const CoreMiddleware = (function(){
var artists_loaded = [];
var albums_loaded = [];
action.tracks.forEach(raw_track => {
if (action.tracks){
var tracks = action.tracks;
} else if (action.track){
var tracks = [action.track];
}
tracks.forEach(raw_track => {
var track = helpers.formatTrack(raw_track);
if (tracks_index[track.uri] !== undefined){
@ -542,7 +550,12 @@ const CoreMiddleware = (function(){
tracks_loaded.push(track);
});
action.tracks = tracks_loaded;
if (action.type == 'CURRENT_TRACK_LOADED'){
action.current_track = tracks_loaded[0];
action.current_track_uri = tracks_loaded[0].uri;
} else {
action.tracks = tracks_loaded;
}
if (artists_loaded.length > 0){
store.dispatch(coreActions.artistsLoaded(artists_loaded));