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

* wip

This commit is contained in:
Seth Call 2015-09-09 14:49:45 -05:00
parent 8c75f41a3f
commit 2ffd9bb7a7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee
View File

@ -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'))

5
web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee
View File

@ -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