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

* validate popup VRFS-3419

This commit is contained in:
Seth Call 2015-08-27 08:12:47 -05:00
parent 8948f0498f
commit 36b6699cde
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,8 @@ mixins = []
# this check ensures we attempt to listen if this component is created in a popup
reactContext = if window.opener? then window.opener else window
# make sure this is actually us opening the window, not someone else (by checking for MixerStore)
reactContext = window unless 'MixerStore' in reactContext
MixerStore = reactContext.MixerStore
MixerActions = reactContext.MixerActions

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

@ -3,7 +3,10 @@ logger = context.JK.logger
mixins = []
if window.opener?
# make sure this is actually us opening the window, not someone else (by checking for MixerStore)
if window.opener? && ('MixerStore' in window.opener)
SessionActions = window.opener.SessionActions
MediaPlaybackStore = window.opener.MediaPlaybackStore
MixerActions = window.opener.MixerActions

4
web/app/assets/javascripts/react-components/PopupRecordingStartStop.js.jsx.coffee
View File

@ -2,8 +2,8 @@ context = window
mixins = []
# this check ensures we attempt to listen if this component is created in a popup
if window.opener
# make sure this is actually us opening the window, not someone else (by checking for MixerStore)
if window.opener && ('MixerStore' in window.opener)
mixins.push(Reflux.listenTo(window.opener.RecordingStore,"onRecordingStateChanged"))
@PopupRecordingStartStop = React.createClass({