From 8c75f41a3f0432ff39759a0916769a540d2cf7a7 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 9 Sep 2015 07:58:22 -0500 Subject: [PATCH] * wip --- .../react-components/SessionMediaTracks.js.jsx.coffee | 2 +- .../javascripts/react-components/helpers/MixerHelper.js.coffee | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 6ca6d46f1..aa9e2b4e6 100644 --- a/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee @@ -334,7 +334,7 @@ ChannelGroupIds = context.JK.ChannelGroupIds @handlePopup() handlePopup: () -> - if @state.mediaSummary.mediaOpen + if @state.mediaSummary.userNeedsMediaControls unless @childWindow? logger.debug("opening media control window") @childWindow = window.open("/popups/media-controls", 'Media Controls', 'scrollbars=yes,toolbar=no,status=no,height=155,width=350') diff --git a/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee b/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee index 4639dc8e2..bfc59c9e8 100644 --- a/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee +++ b/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee @@ -193,6 +193,8 @@ MIX_MODES = context.JK.MIX_MODES; @mediaSummary.mediaOpen = mediaOpenSummary + # the user needs media controls if any media is open, or, if the user has indicated they want to open a JamTrack + @mediaSummary.userNeedsMediaControls == @mediaSummary.mediaOpen || window.JamTrackStore.jamTrack? # figure out if we opened any media isOpener = false