diff --git a/app/src/Spotlights.js b/app/src/Spotlights.js index 10d6638..9fc2301 100644 --- a/app/src/Spotlights.js +++ b/app/src/Spotlights.js @@ -60,7 +60,7 @@ export default class Spotlights extends EventEmitter const oldIndex = this._unmutablePeerList.indexOf(peerId); let index = oldIndex; - + index++; for (let i = 0; i < this._unmutablePeerList.length; i++) { @@ -94,7 +94,7 @@ export default class Spotlights extends EventEmitter const oldIndex = this._unmutablePeerList.indexOf(peerId); let index = oldIndex; - + index--; for (let i = 0; i < this._unmutablePeerList.length; i++) { @@ -119,7 +119,7 @@ export default class Spotlights extends EventEmitter logger.debug('setPeerSpotlight() [peerId:"%s"]', peerId); const index = this._selectedSpotlights.indexOf(peerId); - + if (index !== -1) { this._selectedSpotlights = []; @@ -177,7 +177,7 @@ export default class Spotlights extends EventEmitter { logger.debug( 'room "newpeer" event [id: "%s"]', id); - + if (this._peerList.indexOf(id) === -1) // We don't have this peer in the list { logger.debug('_handlePeer() | adding peer [peerId: "%s"]', id); diff --git a/app/src/actions/chatActions.js b/app/src/actions/chatActions.js index f7b0cf3..0f9f066 100644 --- a/app/src/actions/chatActions.js +++ b/app/src/actions/chatActions.js @@ -9,7 +9,7 @@ export const addResponseMessage = (message) => type : 'ADD_NEW_RESPONSE_MESSAGE', payload : { message } }); - + export const addChatHistory = (chatHistory) => ({ type : 'ADD_CHAT_HISTORY', diff --git a/app/src/actions/meActions.js b/app/src/actions/meActions.js index be7c1ee..7e7d3de 100644 --- a/app/src/actions/meActions.js +++ b/app/src/actions/meActions.js @@ -80,13 +80,13 @@ export const setAudioOutputInProgress = (flag) => type : 'SET_AUDIO_OUTPUT_IN_PROGRESS', payload : { flag } }); - + export const setWebcamInProgress = (flag) => ({ type : 'SET_WEBCAM_IN_PROGRESS', payload : { flag } }); - + export const setScreenShareInProgress = (flag) => ({ type : 'SET_SCREEN_SHARE_IN_PROGRESS', diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js index 1a1e2d3..7cbea6f 100644 --- a/app/src/actions/peerActions.js +++ b/app/src/actions/peerActions.js @@ -26,13 +26,13 @@ export const setPeerVideoInProgress = (peerId, flag) => type : 'SET_PEER_VIDEO_IN_PROGRESS', payload : { peerId, flag } }); - + export const setPeerAudioInProgress = (peerId, flag) => ({ type : 'SET_PEER_AUDIO_IN_PROGRESS', payload : { peerId, flag } }); - + export const setPeerScreenInProgress = (peerId, flag) => ({ type : 'SET_PEER_SCREEN_IN_PROGRESS', diff --git a/app/src/components/AccessControl/LockDialog/ListLobbyPeer.js b/app/src/components/AccessControl/LockDialog/ListLobbyPeer.js index 050994d..e955b53 100644 --- a/app/src/components/AccessControl/LockDialog/ListLobbyPeer.js +++ b/app/src/components/AccessControl/LockDialog/ListLobbyPeer.js @@ -39,7 +39,7 @@ const ListLobbyPeer = (props) => const picture = peer.picture || EmptyAvatar; return ( - { lobbyPeers.length > 0 ? - diff --git a/app/src/components/Containers/Me.js b/app/src/components/Containers/Me.js index f6fb173..733fbc8 100644 --- a/app/src/components/Containers/Me.js +++ b/app/src/components/Containers/Me.js @@ -286,9 +286,9 @@ const Me = (props) => defaultMessage : 'Start screen sharing' }); } - const [ - screenShareTooltipOpen, - screenShareTooltipSetOpen + const [ + screenShareTooltipOpen, + screenShareTooltipSetOpen ] = React.useState(false); const screenShareTooltipHandleClose = () => @@ -365,7 +365,7 @@ const Me = (props) => }} style={spacingStyle} > - + { me.browser.platform !== 'mobile' && smallContainer &&
className={classes.smallContainer} disabled={!me.canSendMic || me.audioInProgress} color={ - micState === 'on' ? - settings.voiceActivatedUnmute && !me.isAutoMuted ? + micState === 'on' ? + settings.voiceActivatedUnmute && !me.isAutoMuted ? 'primary' : 'default' : 'secondary'} @@ -459,7 +459,7 @@ const Me = (props) => }} > { micState === 'on' ? - @@ -477,9 +477,9 @@ const Me = (props) => })} className={classes.fab} disabled={!me.canSendMic || me.audioInProgress} - color={micState === 'on' ? + color={micState === 'on' ? settings.voiceActivatedUnmute && !me.isAutoMuted? 'primary' - : 'default' + : 'default' : 'secondary'} size='large' onClick={() => @@ -561,9 +561,9 @@ const Me = (props) => } { me.browser.platform !== 'mobile' && - { smallContainer ? @@ -854,7 +854,7 @@ const Me = (props) => defaultMessage='ME' />

- + const mapStateToProps = (state) => { let volume; - + // noiseVolume under threshold - if (state.peerVolumes[state.me.id] < state.settings.noiseThreshold) + if (state.peerVolumes[state.me.id] < state.settings.noiseThreshold) { // noiseVolume mapped to range 0.5 ... 1 (threshold switch) - volume = 1 + ((Math.abs(state.peerVolumes[state.me.id] - + volume = 1 + ((Math.abs(state.peerVolumes[state.me.id] - state.settings.noiseThreshold) / (-120 - state.settings.noiseThreshold))); - } + } // noiseVolume over threshold: no noise but voice else { volume = 0; } @@ -933,7 +933,7 @@ export default withRoomContext(connect( return ( prev.room === next.room && prev.me === next.me && - Math.round(prev.peerVolumes[prev.me.id]) === + Math.round(prev.peerVolumes[prev.me.id]) === Math.round(next.peerVolumes[next.me.id]) && prev.peers === next.peers && prev.producers === next.producers && diff --git a/app/src/components/Containers/Peer.js b/app/src/components/Containers/Peer.js index 9c2a6fa..c81627b 100644 --- a/app/src/components/Containers/Peer.js +++ b/app/src/components/Containers/Peer.js @@ -228,14 +228,14 @@ const Peer = (props) => { if (touchTimeout) clearTimeout(touchTimeout); - + setHover(true); }} onTouchEnd={() => { if (touchTimeout) clearTimeout(touchTimeout); - + touchTimeout = setTimeout(() => { setHover(false); @@ -445,14 +445,14 @@ const Peer = (props) => { if (touchTimeout) clearTimeout(touchTimeout); - + setHover(true); }} onTouchEnd={() => { if (touchTimeout) clearTimeout(touchTimeout); - + touchTimeout = setTimeout(() => { setHover(false); @@ -471,7 +471,7 @@ const Peer = (props) =>

} - +
setHover(true)} @@ -480,14 +480,14 @@ const Peer = (props) => { if (touchTimeout) clearTimeout(touchTimeout); - + setHover(true); }} onTouchEnd={() => { if (touchTimeout) clearTimeout(touchTimeout); - + touchTimeout = setTimeout(() => { setHover(false); @@ -544,7 +544,7 @@ const Peer = (props) => } } - + }
- + { if (touchTimeout) clearTimeout(touchTimeout); - + setHover(true); }} onTouchEnd={() => { if (touchTimeout) clearTimeout(touchTimeout); - + touchTimeout = setTimeout(() => { setHover(false); @@ -663,7 +663,7 @@ const Peer = (props) => { if (touchTimeout) clearTimeout(touchTimeout); - + setHover(true); }} onTouchEnd={() => @@ -671,7 +671,7 @@ const Peer = (props) => if (touchTimeout) clearTimeout(touchTimeout); - + touchTimeout = setTimeout(() => { setHover(false); diff --git a/app/src/components/Controls/About.js b/app/src/components/Controls/About.js index c462549..103df43 100644 --- a/app/src/components/Controls/About.js +++ b/app/src/components/Controls/About.js @@ -69,16 +69,16 @@ const About = ({ /> - + Contributions to this work were made on behalf of the GÉANT project, a project that has received funding from the - European Union’s Horizon 2020 research and innovation - programme under Grant Agreement No. 731122 (GN4-2). + European Union’s Horizon 2020 research and innovation + programme under Grant Agreement No. 731122 (GN4-2). On behalf of GÉANT project, GÉANT Association is the sole - owner of the copyright in all material which was developed + owner of the copyright in all material which was developed by a member of the GÉANT project. - + GÉANT Vereniging (Association) is registered with the Chamber of Commerce in Amsterdam with registration number 40535155 and operates in the UK as a branch of GÉANT @@ -106,7 +106,7 @@ const About = ({ /> - + ); }; @@ -114,7 +114,7 @@ About.propTypes = { roomClient : PropTypes.object.isRequired, aboutOpen : PropTypes.bool.isRequired, - handleCloseAbout : PropTypes.func.isRequired, + handleCloseAbout : PropTypes.func.isRequired, classes : PropTypes.object.isRequired }; diff --git a/app/src/components/Controls/Help.js b/app/src/components/Controls/Help.js index ab188b8..d789d10 100644 --- a/app/src/components/Controls/Help.js +++ b/app/src/components/Controls/Help.js @@ -107,13 +107,13 @@ const Help = ({ } /> - + - {shortcuts.map((value, index) => + {shortcuts.map((value, index) => { return (
- + {value.key} - + ); }; @@ -142,7 +142,7 @@ Help.propTypes = { roomClient : PropTypes.object.isRequired, helpOpen : PropTypes.bool.isRequired, - handleCloseHelp : PropTypes.func.isRequired, + handleCloseHelp : PropTypes.func.isRequired, classes : PropTypes.object.isRequired }; diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js index 0ad8ef8..b2cf648 100644 --- a/app/src/components/JoinDialog.js +++ b/app/src/components/JoinDialog.js @@ -327,7 +327,7 @@ const JoinDialog = ({ /> - : + : { title = title ? title : href; text = text ? text : href; - + return `${ text }`; }; diff --git a/app/src/components/MeetingDrawer/Chat/MessageList.js b/app/src/components/MeetingDrawer/Chat/MessageList.js index da6891b..d1c86d2 100644 --- a/app/src/components/MeetingDrawer/Chat/MessageList.js +++ b/app/src/components/MeetingDrawer/Chat/MessageList.js @@ -60,7 +60,7 @@ class MessageList extends React.Component myPicture, classes } = this.props; - + return (
{ this.node = node; }}> { diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js index b11f631..d1d13e0 100644 --- a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js +++ b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js @@ -279,7 +279,7 @@ const ListPeer = (props) => } - { isModerator && webcamConsumer && + { isModerator && webcamConsumer && (availableSpeakerHeight - PADDING_V)) { speakerHeight = (availableSpeakerHeight - PADDING_V); @@ -167,7 +167,7 @@ class Filmstrip extends React.PureComponent let filmStripHeight = availableFilmstripHeight - FILMSTRING_PADDING_V; let filmStripWidth = filmStripHeight * RATIO; - + if ( (filmStripWidth * this.props.boxes) > (availableWidth - FILMSTRING_PADDING_H) @@ -254,7 +254,7 @@ class Filmstrip extends React.PureComponent }; return ( -
const permitted = roles.some((role) => roomPermissions[permission].includes(role) ); - + if (permitted) return true; @@ -265,7 +265,7 @@ export const makePermissionSelector = (permission) => ).length === 0 ) return true; - + return false; } ); diff --git a/app/src/components/Settings/MediaSettings.js b/app/src/components/Settings/MediaSettings.js index 2888d0f..9d48a42 100644 --- a/app/src/components/Settings/MediaSettings.js +++ b/app/src/components/Settings/MediaSettings.js @@ -18,7 +18,7 @@ import Typography from '@material-ui/core/Typography'; const NoiseSlider = withStyles( { - root : + root : { color : '#3880ff', height : 2, @@ -48,7 +48,7 @@ const styles = (theme) => ({ { padding : theme.spacing(2) }, - margin : + margin : { height : theme.spacing(3) }, @@ -72,7 +72,7 @@ const MediaSettings = ({ }) => { const intl = useIntl(); - + const resolutions = [ { value : 'low', label : intl.formatMessage({ @@ -122,7 +122,7 @@ const MediaSettings = ({ audioDevices = Object.values(me.audioDevices); else audioDevices = []; - + let audioOutputDevices; if (me.audioOutputDevices) @@ -174,7 +174,7 @@ const MediaSettings = ({