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

fix vide orecording options

This commit is contained in:
Seth Call 2017-05-12 08:03:59 -05:00
parent de3869ca2c
commit ce02ba8664
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,19 @@ if accessOpener
logger.debug("prevent video from opening", VideoStore) logger.debug("prevent video from opening", VideoStore)
context.JK.prodBubble($root.find('.control'), 'video-window-not-open', {}, {positions:['bottom']}) context.JK.prodBubble($root.find('.control'), 'video-window-not-open', {}, {positions:['bottom']})
return return
if recordVideo == WebCamRecordActive && !VideoStore.openVideoSources.webcam1
context.JK.prodBubble($root.find('.control'), 'no-webcam-1', {}, {positions:['bottom']})
return
if recordVideo == WebCam2RecordActive && !VideoStore.openVideoSources.webcam2
context.JK.prodBubble($root.find('.control'), 'no-webcam-2', {}, {positions:['bottom']})
return
if recordVideo == DesktopRecordActive && !VideoStore.openVideoSources.screen_capture
context.JK.prodBubble($root.find('.control'), 'no-screen-capture', {}, {positions:['bottom']})
return
logger.debug("@inputType, @udiotye", recordChat, recordVideo) logger.debug("@inputType, @udiotye", recordChat, recordVideo)
window.opener.RecordingActions.startRecording(recordVideo, recordChat) window.opener.RecordingActions.startRecording(recordVideo, recordChat)

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

@ -148,6 +148,7 @@ BackendToFrontendFPS = {
# ex: with mac webcam open only: session_window: 2, webcam1: 1} # ex: with mac webcam open only: session_window: 2, webcam1: 1}
# no webcam open: Object {} # no webcam open: Object {}
@openVideoSources = openVideoSources
@anyVideoOpen = Object.keys(openVideoSources).length > 0 @anyVideoOpen = Object.keys(openVideoSources).length > 0
@state.anyVideoOpen = Object.keys(openVideoSources).length > 0 @state.anyVideoOpen = Object.keys(openVideoSources).length > 0
this.trigger(@state) this.trigger(@state)

12
web/app/views/clients/_help.html.slim
View File

@ -371,6 +371,18 @@ script type="text/template" id="template-help-video-window-not-open"
p You've selected to record video, but the video window is not open. p You've selected to record video, but the video window is not open.
p Click the VIDEO button in the main window and try again. p Click the VIDEO button in the main window and try again.
script type="text/template" id="template-help-no-webcam-1"
.video-window-not-open
p You've selected to record your primary webcam, but it is not open.
script type="text/template" id="template-help-no-webcam-2"
.video-window-not-open
p You've selected to record your secondary webcam, but it is not open.
script type="text/template" id="template-help-no-screen-capture"
.video-window-not-open
p You've selected to record your desktop, but that feature is not enabled.
script type="text/template" id="template-help-vid-record-chat-input" script type="text/template" id="template-help-vid-record-chat-input"
.vid-record-chat-input .vid-record-chat-input
p Any chat inputs in the session will also be included in the video if checked. p Any chat inputs in the session will also be included in the video if checked.