* fix up the 'no local tracks' font sizing and click behavior
This commit is contained in:
parent
6fede36b04
commit
a4b3ff4b03
|
|
@ -1,12 +1,17 @@
|
|||
context = window
|
||||
MIX_MODES = context.JK.MIX_MODES
|
||||
|
||||
SessionActions = context.SessionActions
|
||||
ReactCSSTransitionGroup = React.addons.CSSTransitionGroup;
|
||||
|
||||
@SessionMyTracks = React.createClass({
|
||||
|
||||
mixins: [@SessionMyTracksMixin, Reflux.listenTo(@SessionMyTracksStore,"onInputsChanged"), Reflux.listenTo(@AppStore,"onAppInit")]
|
||||
|
||||
goToFtue: (e) ->
|
||||
e.preventDefault()
|
||||
|
||||
SessionActions.leaveSession.trigger({location: '/client#/account/audio'})
|
||||
|
||||
render: () ->
|
||||
|
||||
content = null
|
||||
|
|
@ -27,7 +32,7 @@ ReactCSSTransitionGroup = React.addons.CSSTransitionGroup;
|
|||
You have not set up any inputs for your instrument or vocals.
|
||||
If you want to hear yourself play through the JamKazam app,
|
||||
and let the app mix your live playing with JamTracks, or with other musicians in online sessions,
|
||||
<a href="#" className="open-ftue-no-tracks">click here now.</a>
|
||||
<a href="#" className="open-ftue-no-tracks" onClick={this.goToFtue}>click here now.</a>
|
||||
</p>
|
||||
</div>`
|
||||
|
||||
|
|
|
|||
|
|
@ -65,8 +65,8 @@ ptrCount = 0
|
|||
|
||||
if mixerChanged
|
||||
logger.debug("re-registering VU #{context.JK.groupIdDisplay(mixer)}", mixer)
|
||||
else
|
||||
logger.debug("registered VU #{context.JK.groupIdDisplay(mixer)}", mixer)
|
||||
#else
|
||||
# logger.debug("registered VU #{context.JK.groupIdDisplay(mixer)}", mixer)
|
||||
|
||||
context.JK.VuHelpers.registerVU(@props.side, mixer, @state.ptr, @props.orientation == 'horizontal', @props.lightCount, $root.find('td'))
|
||||
|
||||
|
|
|
|||
|
|
@ -329,6 +329,9 @@ $session-screen-divider: 1190px;
|
|||
padding-bottom:10px;
|
||||
}
|
||||
|
||||
.session-mytracks-notracks p.notice {
|
||||
font-size:14px;
|
||||
}
|
||||
.session-notification {
|
||||
color: white;
|
||||
background-color: #666666;
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@ describe ApiLinksController do
|
|||
|
||||
it "succeeds with one recording" do
|
||||
claimed_recording1 = FactoryGirl.create(:claimed_recording, user: user_partner1)
|
||||
puts claimed_recording1.inspect
|
||||
get :recording_index, format:'json', affiliate_id: partner1.id
|
||||
response.status.should eq(200)
|
||||
body = JSON.parse(response.body)
|
||||
|
|
|
|||
Loading…
Reference in New Issue