diff --git a/web/app/assets/javascripts/globals.js b/web/app/assets/javascripts/globals.js index 3708021cb..75f56ecd6 100644 --- a/web/app/assets/javascripts/globals.js +++ b/web/app/assets/javascripts/globals.js @@ -36,6 +36,10 @@ CHAT: "1" }; + context.JK.AUDIO_FORMATS = ['ogg', 'mp3', 'wma']; + + context.JK.VIDEO_FORMATS = ['mp4', 'wmv', 'mov', 'vob'] + context.JK.AVAILABILITY_US = "United States"; context.JK.MASTER_TRACK = "Master"; diff --git a/web/app/assets/javascripts/react-components/SessionRecordingSettings.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionRecordingSettings.js.jsx.coffee index c0e28d781..67a9b4b26 100644 --- a/web/app/assets/javascripts/react-components/SessionRecordingSettings.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionRecordingSettings.js.jsx.coffee @@ -1,7 +1,7 @@ context = window mixins = [] -AUDIO_FORMATS = ['ogg', 'mp3', 'wma'] + #mixins.push(Reflux.listenTo(@AppStore,"onAppInit")) @@ -51,9 +51,16 @@ AUDIO_FORMATS = ['ogg', 'mp3', 'wma'] handleStartRecording: () -> - - render: () -> + audioFormatOptions = [] + videoFormatOptions = [] + + for format, i in context.JK.AUDIO_FORMATS + audioFormatOptions.push `` + + for format, i in context.JK.VIDEO_FORMATS + videoFormatOptions.push `` + `
@@ -81,22 +88,22 @@ AUDIO_FORMATS = ['ogg', 'mp3', 'wma']
- +
- +
- +
@@ -120,6 +127,9 @@ AUDIO_FORMATS = ['ogg', 'mp3', 'wma'] componentDidMount: () -> $root = jQuery(this.getDOMNode()) + + context.JK.dropdown($root.find('select')) + $includeChatCheckbox = $root.find('#include-chat') context.JK.checkbox($includeChatCheckbox) @@ -128,4 +138,8 @@ AUDIO_FORMATS = ['ogg', 'mp3', 'wma'] $inputBothRadioBtn = $root.find('#recording-input-both') context.JK.checkbox($inputBothRadioBtn) + + componentDidUpdate: () -> + $root = $(this.getDOMNode()) + context.JK.dropdown($root.find('select')) }) \ No newline at end of file diff --git a/web/app/assets/stylesheets/dialogs/sessionRecordingDialog.scss b/web/app/assets/stylesheets/dialogs/sessionRecordingDialog.scss index b7bd0da24..01c3b3019 100644 --- a/web/app/assets/stylesheets/dialogs/sessionRecordingDialog.scss +++ b/web/app/assets/stylesheets/dialogs/sessionRecordingDialog.scss @@ -19,6 +19,9 @@ input[type=text], select { width: 280px; } + input[type=number]{ + width: 50px; + } }