* VRFS-3419 - check better for window opener

* fix changed path
* validate popup VRFS-3419
2015-08-27 09:44:54 -05:00 · 2015-08-27 08:43:14 -05:00 · 2015-08-27 08:12:47 -05:00
4 changed files with 29 additions and 3 deletions
--- a/web/app/assets/javascripts/react-components/MediaControls.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/MediaControls.js.jsx.coffee
@ -7,6 +7,12 @@ 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)
+if window.opener?
+  try
+    m = window.opener.MixerStore
+  catch e
+    reactContext = window

 MixerStore = reactContext.MixerStore
 MixerActions = reactContext.MixerActions
--- a/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee
@ -3,7 +3,18 @@ logger = context.JK.logger

 mixins = []

+
+# make sure this is actually us opening the window, not someone else (by checking for MixerStore)
+
+accessOpener = false
 if window.opener?
+  try
+    m = window.opener.MixerStore
+    accessOpener = true
+  catch e
+
+
+if accessOpener
  SessionActions = window.opener.SessionActions
  MediaPlaybackStore = window.opener.MediaPlaybackStore
  MixerActions = window.opener.MixerActions
--- a/web/app/assets/javascripts/react-components/PopupRecordingStartStop.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/PopupRecordingStartStop.js.jsx.coffee
@ -2,8 +2,17 @@ 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)
+
+accessOpener = false
+if window.opener?
+  try
+    m = window.opener.MixerStore
+    accessOpener = true
+  catch e
+
+
+if accessOpener
  mixins.push(Reflux.listenTo(window.opener.RecordingStore,"onRecordingStateChanged"))

@PopupRecordingStartStop = React.createClass({
--- a/web/app/assets/stylesheets/client/react-components/ReactSelect.css.scss
+++ b/web/app/assets/stylesheets/client/react-components/ReactSelect.css.scss
@ -2,7 +2,7 @@
  *
  *
  # comes from the gem 'rails-assets-react-select'
-  *= require react-select/dist/default.scss
+  *= require react-select/default.scss
 */
  @import "client/common.css.scss";
  .Select-control {
Author	SHA1	Message	Date
Seth Call	0d68a53842	* VRFS-3419 - check better for window opener	2015-08-27 09:44:54 -05:00
Seth Call	377815691f	* fix changed path	2015-08-27 08:43:14 -05:00
Seth Call	b874a522ed	* validate popup VRFS-3419	2015-08-27 08:12:47 -05:00