From 2ffd9bb7a7ca8f0db97e718e6938562d471e0126 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 9 Sep 2015 14:49:45 -0500 Subject: [PATCH] * wip --- .../react-components/PopupMediaControls.js.jsx.coffee | 1 + .../react-components/helpers/MixerHelper.js.coffee | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee b/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee index 37673bf87..07dd25900 100644 --- a/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee @@ -18,6 +18,7 @@ if accessOpener SessionActions = window.opener.SessionActions MediaPlaybackStore = window.opener.MediaPlaybackStore MixerActions = window.opener.MixerActions + JamTrackStore = window.opener.JamTrackStore mixins.push(Reflux.listenTo(MediaPlaybackStore, 'onMediaStateChanged')) 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 bfc59c9e8..e4d46e2b6 100644 --- a/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee +++ b/web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee @@ -194,7 +194,10 @@ 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? + @mediaSummary.userNeedsMediaControls = @mediaSummary.mediaOpen || window.JamTrackStore.jamTrack? + + # this defines what the user wants to be open, not what actually is open in the backend and/or session + @mediaSummary.jamTrack = window.JamTrackStore.jamTrack # figure out if we opened any media isOpener = false