Merge branch 'develop' of github.com:jaedb/Iris into develop

This commit is contained in:
James Barnsley
2019-11-14 09:10:11 +13:00
5 changed files with 6 additions and 6 deletions

View File

@ -52877,7 +52877,7 @@ var ArtistGrid = function (_React$Component) {
var mapStateToProps = function mapStateToProps(state, ownProps) {
return {
albums: state.core.albums,
spotifyAvailable: state.spotify.access_token !== null
spotifyAvailable: state.spotify.enabled
};
};
@ -72266,7 +72266,7 @@ var MopidyMiddleware = function () {
var existing_artist = store.getState().core.artists[artist.uri];
if (existing_artist) {
if (!existing_artist.images) {
if (store.getState().spotify.access_token) {
if (store.getState().spotify.enabled) {
store.dispatch(spotifyActions.getArtistImages(artist));
} else {
store.dispatch(discogsActions.getArtistImages(artist.uri, artist));

File diff suppressed because one or more lines are too long

View File

@ -100,7 +100,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1573459767";
var build = "1573665370";
var version = "3.42.2";
// Construct the script tag

View File

@ -75,7 +75,7 @@ class ArtistGrid extends React.Component {
const mapStateToProps = (state, ownProps) => ({
albums: state.core.albums,
spotifyAvailable: state.spotify.access_token !== null,
spotifyAvailable: state.spotify.enabled,
});
const mapDispatchToProps = (dispatch) => ({

View File

@ -2125,7 +2125,7 @@ const MopidyMiddleware = (function () {
const existing_artist = store.getState().core.artists[artist.uri];
if (existing_artist) {
if (!existing_artist.images) {
if (store.getState().spotify.access_token) {
if (store.getState().spotify.enabled) {
store.dispatch(spotifyActions.getArtistImages(artist));
} else {
store.dispatch(discogsActions.getArtistImages(artist.uri, artist));