This commit is contained in:
Seth Call 2015-08-12 10:09:15 -05:00
parent ed30cfc921
commit 5f014b4139
2 changed files with 11 additions and 4 deletions

View File

@ -23,7 +23,7 @@ MIX_MODES = context.JK.MIX_MODES
artistsShown += 1
if @state.artists.length > @MAX_ARTIST_SHOW
if !@state.show_all_artists && @state.artists.length > @MAX_ARTIST_SHOW
artists.push `<a onClick={this.showAllArtists} className="showall">show all <div className="details-arrow arrow-down" /></a>`
jamtracks = []
#for jamtrack in @state.jamtracks
@ -72,12 +72,13 @@ MIX_MODES = context.JK.MIX_MODES
@search
showAllArtists: () ->
@setState({show_all_artists: true})
search: () ->
if window.JamTrackSearchInput?
@rest.getJamTrackArtists({artist_search: window.JamTrackSearchInput, limit:100})
.done((response) =>
@logger.debug("updating artists #{response.artists}")
@setState({artists:response.artists, search:window.JamTrackSearchInput})
)
@ -117,6 +118,7 @@ MIX_MODES = context.JK.MIX_MODES
afterShow: (data) ->
@setState({show_all_artists: false})
@logger.debug("afterShow")
beforeShow: () ->
@ -143,8 +145,6 @@ MIX_MODES = context.JK.MIX_MODES
@expanded = null
@shownHelperBubbles = false
@logger.debug("onAPPInit", this)
screenBindings =
'beforeShow': @beforeShow

View File

@ -2,9 +2,16 @@
#jamtrackSearch {
div[data-react-class="JamTrackSearchScreen"], .JamTrackSearchScreen {
height:100%;
}
.content-body-scroller {
height:calc(100% - 78px); // 15px top and bottom padding, and 48px used by .controls
padding:15px 30px;
}
.filter-element.desc {
margin-left:15px;
}