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

Small bugs

auto_join_3.3
Håvar Aambø Fosstveit 2020-04-03 10:17:58 +02:00
parent 8544279425
commit 10886e3dc6
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/components/Containers/Me.js
View File

@ -141,8 +141,7 @@ const Me = (props) =>
webcamProducer, webcamProducer,
screenProducer, screenProducer,
canShareScreen, canShareScreen,
classes, classes
theme
} = props; } = props;
const videoVisible = ( const videoVisible = (
@ -312,7 +311,7 @@ const Me = (props) =>
}, 2000); }, 2000);
}} }}
> >
<p className={hover && 'hover'}> <p className={hover ? 'hover' : null}>
<FormattedMessage <FormattedMessage
id='room.me' id='room.me'
defaultMessage='ME' defaultMessage='ME'
@ -455,7 +454,7 @@ const Me = (props) =>
</div> </div>
{ screenProducer && { screenProducer &&
<div <div
className={classnames(classes.root, 'screen', hover && 'hover')} className={classnames(classes.root, 'screen', hover ? 'hover' : null)}
onMouseOver={() => setHover(true)} onMouseOver={() => setHover(true)}
onMouseOut={() => setHover(false)} onMouseOut={() => setHover(false)}
onTouchStart={() => onTouchStart={() =>
@ -501,7 +500,7 @@ const Me = (props) =>
}, 2000); }, 2000);
}} }}
> >
<p className={hover && 'hover'}> <p className={hover ? 'hover' : null}>
<FormattedMessage <FormattedMessage
id='room.me' id='room.me'
defaultMessage='ME' defaultMessage='ME'

10
app/src/components/Containers/Peer.js
View File

@ -168,8 +168,8 @@ const Peer = (props) =>
classnames( classnames(
classes.root, classes.root,
'webcam', 'webcam',
hover && 'hover', hover ? 'hover' : null,
activeSpeaker && 'active-speaker' activeSpeaker ? 'active-speaker' : null
) )
} }
onMouseOver={() => setHover(true)} onMouseOver={() => setHover(true)}
@ -206,7 +206,7 @@ const Peer = (props) =>
} }
<div <div
className={classnames(classes.controls, hover && 'hover')} className={classnames(classes.controls, hover ? 'hover' : null)}
onMouseOver={() => setHover(true)} onMouseOver={() => setHover(true)}
onMouseOut={() => setHover(false)} onMouseOut={() => setHover(false)}
onTouchStart={() => onTouchStart={() =>
@ -352,7 +352,7 @@ const Peer = (props) =>
{ screenConsumer && { screenConsumer &&
<div <div
className={classnames(classes.root, 'screen', hover && 'hover')} className={classnames(classes.root, 'screen', hover ? 'hover' : null)}
onMouseOver={() => setHover(true)} onMouseOver={() => setHover(true)}
onMouseOut={() => setHover(false)} onMouseOut={() => setHover(false)}
onTouchStart={() => onTouchStart={() =>
@ -386,7 +386,7 @@ const Peer = (props) =>
</div> </div>
} }
<div <div
className={classnames(classes.controls, hover && 'hover')} className={classnames(classes.controls, hover ? 'hover' : null)}
onMouseOver={() => setHover(true)} onMouseOver={() => setHover(true)}
onMouseOut={() => setHover(false)} onMouseOut={() => setHover(false)}
onTouchStart={() => onTouchStart={() =>