diff --git a/web/app/assets/javascripts/react-components/SessionBackingTrack.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionBackingTrack.js.jsx.coffee index 049234abd..0f6f656da 100644 --- a/web/app/assets/javascripts/react-components/SessionBackingTrack.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionBackingTrack.js.jsx.coffee @@ -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')}) }) diff --git a/web/app/assets/javascripts/react-components/SessionJamTrack.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionJamTrack.js.jsx.coffee index 667b41cd3..c7b2db5c6 100644 --- a/web/app/assets/javascripts/react-components/SessionJamTrack.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionJamTrack.js.jsx.coffee @@ -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')}) }) diff --git a/web/app/assets/javascripts/react-components/SessionRecordedTrack.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionRecordedTrack.js.jsx.coffee index 6965ad3c5..d182b6450 100644 --- a/web/app/assets/javascripts/react-components/SessionRecordedTrack.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionRecordedTrack.js.jsx.coffee @@ -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')}) }) diff --git a/web/app/views/clients/_help.html.slim b/web/app/views/clients/_help.html.slim index 45a34d785..49edc1293 100644 --- a/web/app/views/clients/_help.html.slim +++ b/web/app/views/clients/_help.html.slim @@ -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. \ No newline at end of file + 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. \ No newline at end of file