From 3976707b14a061371544b4bedb1b991894eb4fb6 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 9 Sep 2015 07:13:51 -0500 Subject: [PATCH] * check for video enabled better --- web/app/assets/javascripts/networkTestHelper.js | 2 +- .../react-components/stores/VideoStore.js.coffee | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/networkTestHelper.js b/web/app/assets/javascripts/networkTestHelper.js index 73170644b..32f52afec 100644 --- a/web/app/assets/javascripts/networkTestHelper.js +++ b/web/app/assets/javascripts/networkTestHelper.js @@ -394,7 +394,7 @@ if (success) { - if(window.VideoStore.videoEnabled) { + if(window.VideoStore.isVideoEnabled()) { startVideoTest(); } else { diff --git a/web/app/assets/javascripts/react-components/stores/VideoStore.js.coffee b/web/app/assets/javascripts/react-components/stores/VideoStore.js.coffee index b2902863d..162af5478 100644 --- a/web/app/assets/javascripts/react-components/stores/VideoStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/VideoStore.js.coffee @@ -48,6 +48,8 @@ BackendToFrontendFPS = { videoEnabled = context.jamClient.FTUEGetVideoShareEnable() + @videoEnabled = videoEnabled + if videoEnabled currentDevice = context.jamClient.FTUECurrentSelectedVideoDevice() deviceNames = context.jamClient.FTUEGetVideoCaptureDeviceNames() @@ -238,5 +240,9 @@ BackendToFrontendFPS = { if shouldShow @configureWindow = window.open("/popups/configure-video", 'Configure Video', 'scrollbars=yes,toolbar=no,status=no,height=395,width=444') ) + + isVideoEnabled:() -> + return @videoEnabled + } )