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

Pausing removes current track for some reason

Browse Source
This commit is contained in:
James Barnsley
2018-09-07 16:16:32 +12:00
parent c085941189
commit b7914e6c66
6 changed files with 13948 additions and 10703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24604
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 // Release details
// These are automatically injected to built HTML // These are automatically injected to built HTML
var build = "1536221360"; var build = "1536275446";
var version = "3.25.1"; var version = "3.25.1";
// Construct the script tag // Construct the script tag

2
src/js/components/Fields/ProgressSlider.js
View File

@ -20,7 +20,7 @@ class ProgressSlider extends React.Component{
render(){ render(){
var percent = 0; var percent = 0;
if (this.props.connected && this.props.time_position && this.props.current_track){ if (this.props.connected && this.props.time_position && this.props.current_track && this.props.current_track.duration){
percent = this.props.time_position / this.props.current_track.duration; percent = this.props.time_position / this.props.current_track.duration;
percent = percent * 100; percent = percent * 100;
if (percent > 1000){ if (percent > 1000){

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

@ -486,20 +486,19 @@ const CoreMiddleware = (function(){
* Index actions * Index actions
* These modify our asset indexes, which are used globally * These modify our asset indexes, which are used globally
**/ **/
/*
case 'CURRENT_TRACK_LOADED': case 'CURRENT_TRACK_LOADED':
store.dispatch(coreActions.trackLoaded(action.track)); store.dispatch(coreActions.trackLoaded(action.track));
action.track = helpers.formatTrack(action.track);
next(action); next(action);
break; break;
case 'QUEUE_LOADED': case 'QUEUE_LOADED':
store.dispatch(coreActions.tracksLoaded(action.tracks)); store.dispatch(coreActions.tracksLoaded(action.tracks));
action.tracks = helpers.formatTracks(action.tracks);
next(action); next(action);
break; break;
*/
case 'CURRENT_TRACK_LOADED':
case 'QUEUE_LOADED':
case 'TRACKS_LOADED': case 'TRACKS_LOADED':
var tracks_index = Object.assign({}, core.tracks); var tracks_index = Object.assign({}, core.tracks);
var artists_index = core.artists; var artists_index = core.artists;
@ -508,13 +507,7 @@ const CoreMiddleware = (function(){
var artists_loaded = []; var artists_loaded = [];
var albums_loaded = []; var albums_loaded = [];
if (action.tracks){ action.tracks.forEach(raw_track => {
var tracks = action.tracks;
} else if (action.track){
var tracks = [action.track];
}
tracks.forEach(raw_track => {
var track = helpers.formatTrack(raw_track); var track = helpers.formatTrack(raw_track);
if (tracks_index[track.uri] !== undefined){ if (tracks_index[track.uri] !== undefined){
@ -550,13 +543,6 @@ const CoreMiddleware = (function(){
tracks_loaded.push(track); tracks_loaded.push(track);
}); });
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){ if (artists_loaded.length > 0){
store.dispatch(coreActions.artistsLoaded(artists_loaded)); store.dispatch(coreActions.artistsLoaded(artists_loaded));
} }

1
src/js/services/mopidy/middleware.js
View File

@ -2155,7 +2155,6 @@ const MopidyMiddleware = (function(){
request(socket, store, 'library.getImages', {uris: action.uris}) request(socket, store, 'library.getImages', {uris: action.uris})
.then(response => { .then(response => {
var records = []; var records = [];
for (var uri in response){ for (var uri in response){
if (response.hasOwnProperty(uri)){ if (response.hasOwnProperty(uri)){