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

* check for video enabled better

This commit is contained in:
Seth Call 2015-09-09 07:13:51 -05:00
parent b483dd537f
commit 3976707b14
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/assets/javascripts/networkTestHelper.js
View File

@ -394,7 +394,7 @@
if (success) {
if(window.VideoStore.videoEnabled) {
if(window.VideoStore.isVideoEnabled()) {
startVideoTest();
}
else {

6
web/app/assets/javascripts/react-components/stores/VideoStore.js.coffee
View File

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