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

Context menus now at the view level

Browse Source
This commit is contained in:
James Barnsley
2017-03-06 09:03:20 +13:00
parent 644858ebf7
commit 69d535e941
16 changed files with 127 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/views/library/LibraryAlbums.js
View File

@ -183,16 +183,16 @@ class LibraryAlbums extends React.Component{
}
]
var actions = (
var options = (
<span>
<DropdownField icon="sort" name="Sort" value={this.props.sort} options={sort_options} reverse={this.props.sort_reverse} handleChange={val => this.setSort(val)} />
<DropdownField icon="eye" name="View" value={this.props.view} options={view_options} handleChange={val => this.props.uiActions.set({ library_albums_view: val })} />
<DropdownField icon="sort" name="Sort" value={this.props.sort} options={sort_options} reverse={this.props.sort_reverse} handleChange={val => {this.setSort(val); this.props.uiActions.hideContextMenu() }} />
<DropdownField icon="eye" name="View" value={this.props.view} options={view_options} handleChange={val => {this.props.uiActions.set({ library_albums_view: val }); this.props.uiActions.hideContextMenu() }} />
</span>
)
return (
<div className="view library-albums-view">
<Header icon="cd" title="My albums" actions={actions} />
<Header icon="cd" title="My albums" options={options} uiActions={this.props.uiActions} />
{ this.renderView(albums) }
<LazyLoadListener enabled={this.props.library_albums_more} loadMore={ () => this.loadMore() }/>
</div>

11
src/js/views/library/LibraryArtists.js
View File

@ -75,8 +75,7 @@ class LibraryArtists extends React.Component{
handleContextMenu={(e,item) => this.handleContextMenu(e,item)}
rows={artists}
columns={columns}
link_prefix={global.baseURL+"artist/"}
show_source_icon={true} />
link_prefix={global.baseURL+"artist/"} />
</section>
)
}else{
@ -132,16 +131,16 @@ class LibraryArtists extends React.Component{
}
]
var actions = (
var options = (
<span>
<DropdownField icon="sort" name="Sort" value={ this.props.sort } options={sort_options} reverse={this.props.sort_reverse} handleChange={ value => this.setSort(value) } />
<DropdownField icon="eye" name="View" value={ this.props.view } options={view_options} handleChange={ value => this.props.uiActions.set({ library_artists_view: value }) } />
<DropdownField icon="sort" name="Sort" value={ this.props.sort } options={sort_options} reverse={this.props.sort_reverse} handleChange={value => {this.setSort(value); this.props.uiActions.hideContextMenu() }} />
<DropdownField icon="eye" name="View" value={ this.props.view } options={view_options} handleChange={value => {this.props.uiActions.set({ library_artists_view: value }); this.props.uiActions.hideContextMenu()}} />
</span>
)
return (
<div className="view library-artists-view">
<Header icon="mic" title="My artists" actions={actions} />
<Header icon="mic" title="My artists" options={options} uiActions={this.props.uiActions} />
{ this.renderView(artists) }
<LazyLoadListener enabled={this.props.library_artists_more} loadMore={ () => this.loadMore() }/>
</div>

8
src/js/views/library/LibraryLocalAlbums.js
View File

@ -141,16 +141,16 @@ class LibraryLocalAlbums extends React.Component{
}
]
var actions = (
var options = (
<span>
<DropdownField icon="sort" name="Sort" value={this.props.sort} options={sort_options} reverse={this.props.sort_reverse} handleChange={val => this.setSort(val)} />
<DropdownField icon="eye" name="View" value={this.props.view} options={view_options} handleChange={val => this.props.uiActions.set({ library_local_albums_view: val })} />
<DropdownField icon="sort" name="Sort" value={this.props.sort} options={sort_options} reverse={this.props.sort_reverse} handleChange={val => {this.setSort(val); this.props.uiActions.hideContextMenu() }} />
<DropdownField icon="eye" name="View" value={this.props.view} options={view_options} handleChange={val => {this.props.uiActions.set({ library_local_albums_view: val }); this.props.uiActions.hideContextMenu() }} />
</span>
)
return (
<div className="view library-local-view">
<Header icon="music" title="Local albums" actions={actions} />
<Header icon="music" title="Local albums" options={options} uiActions={this.props.uiActions} />
{this.renderView(albums)}
<LazyLoadListener enabled={(this.moreURIsToLoad().length > 0)} loadMore={ () => this.loadMore() }/>
</div>

6
src/js/views/library/LibraryLocalDirectory.js
View File

@ -71,9 +71,9 @@ class LibraryLocalDirectory extends React.Component{
var items = this.arrange_directory( this.props.directory )
var actions = null
var options = null
if (this.props.params.uri != 'local:directory' ){
actions = (
options = (
<button onClick={ () => window.history.back() }>
<FontAwesome name="reply" />&nbsp;
Back
@ -83,7 +83,7 @@ class LibraryLocalDirectory extends React.Component{
return (
<div className="view library-local-view">
<Header icon="music" title="Local files" actions={actions} />
<Header icon="music" title="Local files" options={options} uiActions={this.props.uiActions} />
<section className="list-wrapper">
<List
columns={[{ name: 'name', width: '100'}]}

22
src/js/views/library/LibraryPlaylists.js
View File

@ -69,6 +69,11 @@ class LibraryPlaylists extends React.Component{
label: 'Owner',
name: 'owner'
},
{
width: 10,
label: 'Source',
name: 'source'
},
{
width: 10,
label: 'Tracks',
@ -76,7 +81,7 @@ class LibraryPlaylists extends React.Component{
},
{
width: 10,
label: 'Can edit',
label: 'Editable',
name: 'can_edit'
}
]
@ -86,8 +91,7 @@ class LibraryPlaylists extends React.Component{
handleContextMenu={(e,item) => this.handleContextMenu(e,item)}
rows={playlists}
columns={columns}
link_prefix={global.baseURL+"playlist/"}
show_source_icon={true} />
link_prefix={global.baseURL+"playlist/"} />
</section>
)
}else{
@ -137,20 +141,20 @@ class LibraryPlaylists extends React.Component{
}
]
var actions = (
<div>
<DropdownField icon="sort" name="Sort" value={this.props.sort} options={sort_options} reverse={this.props.sort_reverse} handleChange={val => this.setSort(val)} />
<DropdownField icon="eye" name="View" value={this.props.view} options={view_options} handleChange={val => this.props.uiActions.set({ library_playlists_view: val}) } />
var options = (
<span>
<DropdownField icon="sort" name="Sort" value={this.props.sort} options={sort_options} reverse={this.props.sort_reverse} handleChange={val => {this.setSort(val); this.props.uiActions.hideContextMenu() }} />
<DropdownField icon="eye" name="View" value={this.props.view} options={view_options} handleChange={val => {this.props.uiActions.set({ library_playlists_view: val}); this.props.uiActions.hideContextMenu() }} />
<button onClick={ () => this.props.uiActions.openModal('create_playlist', {} ) }>
<FontAwesome name="plus" />&nbsp;
New
</button>
</div>
</span>
)
return (
<div className="view library-playlists-view">
<Header icon="playlist" title="My playlists" actions={actions} />
<Header icon="playlist" title="My playlists" options={options} uiActions={this.props.uiActions} />
{ this.renderView() }
</div>
)