* VRFS-3356 temmporary patch for MyTracks being missing

This commit is contained in:
Seth Call 2015-07-21 21:01:13 -05:00
parent 45e8ab0480
commit 80edd3f8f5
5 changed files with 33 additions and 5 deletions

View File

@ -21,7 +21,7 @@ context.JK.ClientInit = class ClientInit
this.watchBroadcast()
checkBroadcast: () =>
promise = broadcastActions.load.triggerPromise()
promise = broadcastActions.load.trigger()
if promise
promise.catch(() ->
false

View File

@ -28,6 +28,13 @@ MixerActions = @MixerActions
'muted' : muteMixer?.mute
})
trackClasses = classNames({
'session-track' : true
'my-track' : true
'has-mixer' : this.props.hasMixer
'no-mixer' : !this.props.hasMixer
})
pan = if this.props.mixers.mixer? then this.props.mixers.mixer.pan else 0
panStyle = {
@ -37,7 +44,7 @@ MixerActions = @MixerActions
# <div className="track-icon-equalizer" />
`<div className="session-track my-track">
`<div className={trackClasses}>
<div className="disabled-track-overlay" />
<div className="session-track-contents">
<div className="name">{this.props.trackName}</div>
@ -81,6 +88,14 @@ MixerActions = @MixerActions
,
{width:331, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
unless this.props.hasMixer
$mute.on("mouseenter", false)
$mute.on("mouseleave", false)
$pan.on("mouseentere", false)
$pan.on("mouseleave", false)
context.JK.helpBubble($root.find('.disabled-track-overlay'), 'missing-my-tracks', {}, {positions:['top'], offsetParent: $root.closest('.top-parent')})
componentWillUpdate: (nextProps, nextState) ->
$root = $(this.getDOMNode())
$mute = $root.find('.track-icon-mute')
@ -90,7 +105,15 @@ MixerActions = @MixerActions
if nextProps.mixers.mixer?
$mute.off("click", false)
$pan.off("click", false)
$mute.off("mouseenter", false)
$mute.off("mouseleave", false)
$pan.off("mouseenter", false)
$pan.off("mouseleave", false)
else
$mute.on("click", false)
$pan.on("click", false)
$mute.on("mouseenter", false)
$mute.on("mouseleave", false)
$pan.on("mouseentere", false)
$pan.on("mouseleave", false)
})

View File

@ -31,12 +31,14 @@ context = window
mixerFinder = [participant.client_id, track, true] # so that other callers can re-find their mixer data
mixerData = mixers.findMixerForTrack(participant.client_id, track, true, @props.mode)
hasMixer = mixerData.mixer?
# todo: sessionModel.setAudioEstablished
instrumentIcon = context.JK.getInstrumentIcon45(track.instrument_id);
trackName = "#{name}: #{track.instrument}"
tracks.push({track: track, mixerFinder: mixerFinder, mixers: mixerData, name: name, trackName: trackName, instrumentIcon: instrumentIcon, photoUrl: photoUrl, clientId: participant.client_id})
tracks.push({track: track, mixerFinder: mixerFinder, mixers: mixerData, hasMixer:hasMixer, name: name, trackName: trackName, instrumentIcon: instrumentIcon, photoUrl: photoUrl, clientId: participant.client_id})
else

View File

@ -317,4 +317,8 @@ script type="text/template" id="template-help-master-metronome-notice"
script type="text/template" id="template-help-personal-media-track"
.personal-media-track
p Only the person who opened the audio track can modify volume and pan.
p Only the person who opened the audio track can modify volume and pan.
script type="text/template" id="template-help-missing-my-tracks"
.missing-my-tracks
p Click the RESYNC button up above to search for your track again.

View File

@ -162,7 +162,6 @@
-step=4
-if (Rails.application.config.video_available && Rails.application.config.video_available!="none")
%em=Rails.application.config.video_available
.wizard-step.video-gear{ 'layout-wizard-step' => "#{step+=1}", 'dialog-title' => "Select Video Gear", 'dialog-purpose' => "SelectVideoGear" }
.ftuesteps
.clearall