seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-3351 - advise users why they can't adjust volume remotely on media tracks

This commit is contained in:
Seth Call 2015-07-21 14:26:03 -05:00
parent 609cdacec3
commit f76987c2e5
4 changed files with 62 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
web/app/assets/javascripts/react-components/SessionBackingTrack.js.jsx.coffee
View File

@ -1,5 +1,5 @@
context = window
MIX_MODES = context.JK.MIX_MODES
MixerActions = @MixerActions
@SessionBackingTrack = React.createClass({
@ -70,20 +70,23 @@ MixerActions = @MixerActions
$mute = $root.find('.track-icon-mute')
$pan = $root.find('.track-icon-pan')
context.JK.interactReactBubble(
$mute,
'SessionTrackVolumeHover',
() =>
{mixers:@mixers()}
,
{width:235, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
context.JK.interactReactBubble(
$pan,
'SessionTrackPanHover',
() =>
{mixers:@mixers()}
,
{width:331, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
if @props.isOpener || @props.mode == MIX_MODES.MASTER
context.JK.interactReactBubble(
$mute,
'SessionTrackVolumeHover',
() =>
{mixers:@mixers()}
,
{width:235, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
context.JK.interactReactBubble(
$pan,
'SessionTrackPanHover',
() =>
{mixers:@mixers()}
,
{width:331, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
else
context.JK.helpBubble($mute, 'personal-media-track', {}, {positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
context.JK.helpBubble($pan, 'personal-media-track', {}, {positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
})

35
web/app/assets/javascripts/react-components/SessionJamTrack.js.jsx.coffee
View File

@ -1,5 +1,5 @@
context = window
MIX_MODES = context.JK.MIX_MODES
MixerActions = @MixerActions
@SessionJamTrack = React.createClass({
@ -70,20 +70,23 @@ MixerActions = @MixerActions
$mute = $root.find('.track-icon-mute')
$pan = $root.find('.track-icon-pan')
context.JK.interactReactBubble(
$mute,
'SessionTrackVolumeHover',
() =>
{mixers:@mixers()}
,
{width:235, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
context.JK.interactReactBubble(
$pan,
'SessionTrackPanHover',
() =>
{mixers:@mixers()}
,
{width:331, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
if @props.isOpener || @props.mode == MIX_MODES.MASTER
context.JK.interactReactBubble(
$mute,
'SessionTrackVolumeHover',
() =>
{mixers:@mixers()}
,
{width:235, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
context.JK.interactReactBubble(
$pan,
'SessionTrackPanHover',
() =>
{mixers:@mixers()}
,
{width:331, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
else
context.JK.helpBubble($mute, 'personal-media-track', {}, {positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
context.JK.helpBubble($pan, 'personal-media-track', {}, {positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
})

34
web/app/assets/javascripts/react-components/SessionRecordedTrack.js.jsx.coffee
View File

@ -1,5 +1,5 @@
context = window
MIX_MODES = context.JK.MIX_MODES
MixerActions = @MixerActions
@SessionRecordedTrack = React.createClass({
@ -70,20 +70,24 @@ MixerActions = @MixerActions
$mute = $root.find('.track-icon-mute')
$pan = $root.find('.track-icon-pan')
context.JK.interactReactBubble(
$mute,
'SessionTrackVolumeHover',
() =>
{mixers:@mixers()}
,
{width:235, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
if @props.isOpener || @props.mode == MIX_MODES.MASTER
context.JK.interactReactBubble(
$mute,
'SessionTrackVolumeHover',
() =>
{mixers:@mixers()}
,
{width:235, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
context.JK.interactReactBubble(
$pan,
'SessionTrackPanHover',
() =>
{mixers:@mixers()}
,
{width:331, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
context.JK.interactReactBubble(
$pan,
'SessionTrackPanHover',
() =>
{mixers:@mixers()}
,
{width:331, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
else
context.JK.helpBubble($mute, 'personal-media-track', {}, {positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
context.JK.helpBubble($pan, 'personal-media-track', {}, {positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
})

6
web/app/views/clients/_help.html.slim
View File

@ -313,4 +313,8 @@ script type="text/template" id="template-help-jamtrack-browse-cta"
script type="text/template" id="template-help-master-metronome-notice"
.master-metronome-notice
p The metronome does not produce any sound in the master mix.
p The metronome does not produce any sound in the master mix.
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.