From 5f014b4139183b4b0d99dfe13c0bdc90dcc20ff4 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 12 Aug 2015 10:09:15 -0500
Subject: [PATCH] * wip

---
 .../react-components/JamTrackSearchScreen.js.jsx.coffee   | 8 ++++----
 web/app/assets/stylesheets/client/jamtrackSearch.css.scss | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee
index 01db01760..be30a43d2 100644
--- a/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee
@@ -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
diff --git a/web/app/assets/stylesheets/client/jamtrackSearch.css.scss b/web/app/assets/stylesheets/client/jamtrackSearch.css.scss
index 480d5cc96..01d8305c4 100644
--- a/web/app/assets/stylesheets/client/jamtrackSearch.css.scss
+++ b/web/app/assets/stylesheets/client/jamtrackSearch.css.scss
@@ -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;
   }