From 0c58a0c1d384dbcaebe43f132f6a4e9aef7f9d24 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 27 Jul 2015 15:35:21 -0500
Subject: [PATCH] * VRFS-3364 - show metronome while jamtrack is open

---
 .../react-components/SessionMediaTracks.js.jsx.coffee    | 7 +++----
 .../react-components/SessionMetronome.js.jsx.coffee      | 1 +
 .../client/react-components/SessionTrack.css.scss        | 9 +++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
index f72068f29..d4d50a8ae 100644
--- a/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
@@ -263,10 +263,9 @@ ChannelGroupIds = context.JK.ChannelGroupIds
         # All the JamTracks
         mediaTracks.push(`<SessionJamTrackCategory key="JamTrackCategory" jamTrackName={this.state.jamTrackName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.PERSONAL} />`)
 
-        # this is not ready yet until VRFS-3363 is done
-        #if @state.metronome?
-        #  @state.metronome.mode = MIX_MODES.PERSONAL
-        #  mediaTracks.push(`<SessionMetronome key="JamTrackMetronome"  {...this.state.metronome} />`)
+        if @state.metronome?
+          @state.metronome.mode = MIX_MODES.PERSONAL
+          mediaTracks.push(`<SessionMetronome key="JamTrackMetronome"  {...this.state.metronome} location="jam-track" />`)
 
         for jamTrack in @state.jamTracks
           jamTrack.mode = MIX_MODES.PERSONAL
diff --git a/web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee
index d1231642d..aa7654c7e 100644
--- a/web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee
@@ -33,6 +33,7 @@ MIX_MODES = context.JK.MIX_MODES
       "session-track" : true
       "metronome" : true
       "no-mixer" : @props.mode == MIX_MODES.MASTER  # show it as disabled if in master mode
+      "in-jam-track" : @props.location == 'jam-track'
     })
 
     pan = if mixers.mixer? then mixers.mixer?.pan else 0
diff --git a/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss b/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
index 49529aed6..57c2bbe03 100644
--- a/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
+++ b/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
@@ -175,6 +175,15 @@
     .track-controls {
       margin-left:0;
     }
+    &.in-jam-track {
+       min-height:56px;
+      .track-buttons {
+        margin-top:2px;
+      }
+      table.vu {
+        margin-top: 10px;
+      }
+    }
   }
 
   &.recorded-track, &.jam-track, &.recorded-category, &.jam-track-category {