Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some small fixes to button disabled on load.

master
Håvar Aambø Fosstveit 2019-04-05 23:17:43 +02:00
parent 7dc4d62c5b
commit dd12d76a5d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/components/Controls/Sidebar.js
View File

@ -152,6 +152,7 @@ const Sidebar = (props) =>
<Fab <Fab
aria-label='Mute mic' aria-label='Mute mic'
className={classes.fab} className={classes.fab}
disabled={!me.canSendMic || me.audioInProgress}
color={micState === 'on' ? 'default' : 'secondary'} color={micState === 'on' ? 'default' : 'secondary'}
size={smallScreen ? 'large' : 'medium'} size={smallScreen ? 'large' : 'medium'}
onClick={() => onClick={() =>
@ -172,6 +173,7 @@ const Sidebar = (props) =>
<Fab <Fab
aria-label='Mute video' aria-label='Mute video'
className={classes.fab} className={classes.fab}
disabled={!me.canSendWebcam || me.webcamInProgress}
color={webcamState === 'on' ? 'default' : 'secondary'} color={webcamState === 'on' ? 'default' : 'secondary'}
size={smallScreen ? 'large' : 'medium'} size={smallScreen ? 'large' : 'medium'}
onClick={() => onClick={() =>

4
app/src/components/Settings/Settings.js
View File

@ -107,7 +107,7 @@ const Settings = ({
name='Camera' name='Camera'
autoWidth autoWidth
className={classes.selectEmpty} className={classes.selectEmpty}
disabled={webcams.length === 0} disabled={webcams.length === 0 || me.webcamInProgress}
> >
{ webcams.map((webcam, index) => { webcams.map((webcam, index) =>
{ {
@ -138,7 +138,7 @@ const Settings = ({
name='Audio device' name='Audio device'
autoWidth autoWidth
className={classes.selectEmpty} className={classes.selectEmpty}
disabled={audioDevices.length === 0} disabled={audioDevices.length === 0 || me.audioInProgress}
> >
{ audioDevices.map((audio, index) => { audioDevices.map((audio, index) =>
{ {