Weening out old full props; Dropzone add to playlist

This commit is contained in:
James Barnsley
2016-11-19 13:06:08 +13:00
parent d8e430858c
commit 96ad8a75c1
18 changed files with 70 additions and 94 deletions

View File

@ -1,21 +0,0 @@
import React, { PropTypes } from 'react'
import FontAwesome from 'react-fontawesome'
import { Link } from 'react-router'
export default class AlbumLink extends React.Component{
constructor(props) {
super(props);
}
render(){
if( !this.props.album ) return <span>-</span>
if( !this.props.album.uri ) return <span>{ this.props.album.name }</span>
var link = '/album/' + this.props.album.uri;
return (
<Link to={link} className="album-link">{ this.props.album.name }</Link>
);
}
}

View File

@ -89,11 +89,6 @@ class ContextMenu extends React.Component{
this.props.uiActions.hideContextMenu();
}
addToPlaylist(){
this.props.uiActions.openModal( 'AddToPlaylistModal', { track_indexes: this.props.context_menu.data.selected_tracks_indexes })
this.props.uiActions.hideContextMenu();
}
removeFromPlaylist(){
this.props.uiActions.removeTracksFromPlaylist( this.props.playlist.uri, this.props.context_menu.data.selected_tracks_indexes )
this.props.uiActions.hideContextMenu();

View File

@ -49,11 +49,13 @@ class Dropzones extends React.Component{
}
switch( target.action ){
case 'enqueue':
this.props.mopidyActions.enqueueTracks( uris )
break
case 'add_to_playlist':
this.props.uiActions.openModal( 'add_to_playlist', { tracks_uris: uris } )
break
}
}

View File

@ -3,14 +3,14 @@ import React, { PropTypes } from 'react'
import Icon from '../Icon'
import * as helpers from '../../helpers'
class AddToPlaylistModal extends React.Component{
export default class AddToPlaylistModal extends React.Component{
constructor(props){
super(props)
}
playlistSelected( playlist_uri ){
this.props.uiActions.addTracksToPlaylist( playlist_uri, this.props.data.track_indexes )
this.props.uiActions.addTracksToPlaylist( playlist_uri, this.props.tracks_uris )
this.props.uiActions.closeModal()
}

View File

@ -29,7 +29,7 @@ class Modal extends React.Component{
</div>
<div className="content">
{ this.props.modal.name == 'add_to_playlist' ? <AddToPlaylistModal uiActions={this.props.uiActions} context_menu={this.props.context_menu.data} /> : null }
{ this.props.modal.name == 'add_to_playlist' ? <AddToPlaylistModal uiActions={this.props.uiActions} playlists={this.props.playlists} tracks_uris={this.props.modal.data.tracks_uris} /> : null }
{ this.props.modal.name == 'create_playlist' ? <CreatePlaylistModal uiActions={this.props.uiActions} /> : null }
{ this.props.modal.name == 'edit_playlist' ? <EditPlaylistModal uiActions={this.props.uiActions} data={this.props.modal.data} /> : null }

View File

@ -1,10 +1,11 @@
import React, { PropTypes } from 'react'
import { Link } from 'react-router'
import FontAwesome from 'react-fontawesome'
import ArtistSentence from './ArtistSentence'
import AlbumLink from './AlbumLink'
import Dater from './Dater'
var helpers = require('../helpers.js')
import * as helpers from '../helpers'
export default class Track extends React.Component{
@ -55,7 +56,7 @@ export default class Track extends React.Component{
{ track.artists ? <ArtistSentence artists={track.artists} /> : '-' }
</span>
<span className="col album">
{ track.album ? <AlbumLink album={track.album} /> : '-' }
{ track.album ? <Link to={'/album/'+track.album.uri}>{track.album.name}</Link> : '-' }
</span>
<span className="col duration">
{ track.duration_ms ? <Dater type="length" data={track.duration_ms} /> : null }