From 72c31f045b01a579a28fc936dfe58842d2f48b05 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Mon, 13 Mar 2017 16:06:31 +1300 Subject: [PATCH] Artist lists; Context menu title (custom) --- src/js/components/ArtistList.js | 2 +- src/js/components/ContextMenu.js | 9 +++++++-- src/js/components/Header.js | 1 + src/scss/components/_lists.scss | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/js/components/ArtistList.js b/src/js/components/ArtistList.js index babaa2cb..7b28c784 100755 --- a/src/js/components/ArtistList.js +++ b/src/js/components/ArtistList.js @@ -13,7 +13,7 @@ export default class ArtistList extends React.Component{ if( !this.props.artists ) return null return ( -
+
{ this.props.artists.map( (artist, index) => { if( artist.uri ){ diff --git a/src/js/components/ContextMenu.js b/src/js/components/ContextMenu.js index 5e7247b2..c1f30ae2 100755 --- a/src/js/components/ContextMenu.js +++ b/src/js/components/ContextMenu.js @@ -266,8 +266,13 @@ class ContextMenu extends React.Component{ var context = this.getContext() if (context.name == 'custom'){ - return null - // TODO: make this the page title + return ( + +
+ {this.props.menu.title} +
+
+ ) } switch (context.type){ diff --git a/src/js/components/Header.js b/src/js/components/Header.js index 5a15b994..b2ffe150 100755 --- a/src/js/components/Header.js +++ b/src/js/components/Header.js @@ -21,6 +21,7 @@ export default class Header extends React.Component{ var data = { e: e, context: 'custom', + title: this.props.title, options: options } this.props.uiActions.showContextMenu(data) diff --git a/src/scss/components/_lists.scss b/src/scss/components/_lists.scss index 45c0f172..5c4ddb01 100755 --- a/src/scss/components/_lists.scss +++ b/src/scss/components/_lists.scss @@ -158,7 +158,7 @@ } } - .artist-list { + &.artist-list { .artist { display: block; border: 0;