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

Only show loader when asset completely unloaded

Browse Source
This commit is contained in:
James Barnsley
2018-04-10 08:01:36 +12:00
parent 949601cb95
commit 7873158c59
5 changed files with 28270 additions and 26350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/js/views/Album.js
View File

@ -105,16 +105,16 @@ class Album extends React.Component{
}
render(){
if (helpers.isLoading(this.props.load_queue,['spotify_albums/'+helpers.getFromUri('albumid',this.props.params.uri)])){
return (
<div className="body-loader loading">
<div className="loader"></div>
</div>
)
}
if (!this.props.album){
return null
if (!this.props.album){
if (helpers.isLoading(this.props.load_queue,['spotify_albums/'+helpers.getFromUri('albumid',this.props.params.uri)])){
return (
<div className="body-loader loading">
<div className="loader"></div>
</div>
)
} else {
return null;
}
}
var artists = []
@ -173,13 +173,6 @@ class Album extends React.Component{
}
}
/**
* Export our component
*
* We also integrate our global store, using connect()
**/
const mapStateToProps = (state, ownProps) => {
var uri = ownProps.params.uri;
return {

10
src/js/views/Artist.js
View File

@ -115,15 +115,7 @@ class Artist extends React.Component{
)
}
renderBody(){
if (helpers.isLoading(this.props.load_queue,['spotify_artists/'+helpers.getFromUri('artistid',this.props.params.uri), 'lastfm_method=artist.getInfo'])){
return (
<div className="body-loader loading">
<div className="loader"></div>
</div>
)
}
renderBody(){
var scheme = helpers.uriSource(this.props.params.uri);
var related_artists = []

31
src/js/views/Playlist.js
View File

@ -159,20 +159,25 @@ class Playlist extends React.Component{
}
render(){
if (!this.props.playlist) return null
var scheme = helpers.uriSource(this.props.params.uri);
var user_id = helpers.getFromUri('userid',this.props.params.uri);
var playlist_id = helpers.getFromUri('playlistid',this.props.params.uri);
if (!this.props.playlist){
if (helpers.isLoading(this.props.load_queue,['spotify_users/'+user_id+'/playlists/'+playlist_id+'?'])){
return (
<div className="body-loader loading">
<div className="loader"></div>
</div>
)
} else {
return null;
}
}
var scheme = helpers.uriSource(this.props.params.uri )
var context = 'playlist'
if (this.props.playlist.can_edit) context = 'editable-playlist'
var user_id = helpers.getFromUri('userid',this.props.params.uri)
var playlist_id = helpers.getFromUri('playlistid',this.props.params.uri)
if (helpers.isLoading(this.props.load_queue,['spotify_users/'+user_id+'/playlists/'+playlist_id+'?'])){
return (
<div className="body-loader loading">
<div className="loader"></div>
</div>
)
var context = 'playlist';
if (this.props.playlist.can_edit){
context = 'editable-playlist';
}
var tracks = [];