diff --git a/src/js/components/Modal/Modal.js b/src/js/components/Modal/Modal.js
index 08cdff8e..05156240 100755
--- a/src/js/components/Modal/Modal.js
+++ b/src/js/components/Modal/Modal.js
@@ -29,8 +29,8 @@ class Modal extends React.Component{
- { this.props.modal.name == 'add_to_playlist' ?
: null }
- { this.props.modal.name == 'create_playlist' ?
: null }
+ { this.props.modal.name == 'add_to_playlist' ?
: null }
+ { this.props.modal.name == 'create_playlist' ?
: null }
{ this.props.modal.name == 'edit_playlist' ?
: null }
diff --git a/src/js/services/spotify/actions.js b/src/js/services/spotify/actions.js
index c38a7e9d..b55d2e85 100755
--- a/src/js/services/spotify/actions.js
+++ b/src/js/services/spotify/actions.js
@@ -539,7 +539,8 @@ export function getPlaylist( uri ){
$.when(
- sendRequest( dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'?market='+getState().spotify.country )
+ // get the main playlist object
+ sendRequest( dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'?market='+getState().spotify.country )
.then( response => {
Object.assign( playlist, response );
}),
diff --git a/src/js/views/App.js b/src/js/views/App.js
index b96a0a40..5c2b344e 100755
--- a/src/js/views/App.js
+++ b/src/js/views/App.js
@@ -94,9 +94,12 @@ class App extends React.Component{
break;
case 27: // esc
- if( this.props.dragger.dragging ){
+ if( this.props.dragger && this.props.dragger.dragging ){
this.props.uiActions.dragCancel();
}
+ if( this.props.modal ){
+ this.props.uiActions.closeModal();
+ }
break;
}
}
@@ -131,6 +134,7 @@ const mapStateToProps = (state, ownProps) => {
spotify_authorized: state.spotify.authorized,
play_state: state.mopidy.play_state,
dragger: state.ui.dragger,
+ modal: state.ui.modal,
context_menu: state.ui.context_menu
}
}
diff --git a/src/js/views/Playlist.js b/src/js/views/Playlist.js
index 79bfbe10..72dee045 100755
--- a/src/js/views/Playlist.js
+++ b/src/js/views/Playlist.js
@@ -2,6 +2,7 @@
import React, { PropTypes } from 'react'
import { connect } from 'react-redux'
import { bindActionCreators } from 'redux'
+import { Link } from 'react-router'
import FontAwesome from 'react-fontawesome'
import * as helpers from '../helpers'
@@ -120,6 +121,8 @@ class Playlist extends React.Component{
- { this.props.playlist.tracks_total } tracks,
{ this.props.playlist.last_modified ? - Updated ago
: null }
+ { this.props.playlist.followers ? - {this.props.playlist.followers.total} followers
: null }
+ { scheme == 'spotify' ? - By {this.props.playlist.owner.id} { !this.props.playlist.public ? : null }
: null }
{ scheme == 'spotify' ? - Spotify playlist
: null }
{ scheme == 'm3u' ? - Local playlist
: null }
diff --git a/src/scss/views/_playlist.scss b/src/scss/views/_playlist.scss
index 2cf38285..9c6c7a26 100755
--- a/src/scss/views/_playlist.scss
+++ b/src/scss/views/_playlist.scss
@@ -23,7 +23,7 @@
width: 35%;
background: $faint_grey;
- .thumbnail {
+ > .thumbnail {
float: none;
margin: 0 auto;
max-width: none;
@@ -70,5 +70,9 @@
}
}
}
+
+ .owner {
+ padding: 30px;
+ }
}
}