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 07:58:22 -05:00
parent 2260350fc4
commit 8c75f41a3f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
View File

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

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

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