diff --git a/config.js b/config.js index 72cc46a09..3f14ab3c7 100644 --- a/config.js +++ b/config.js @@ -631,8 +631,6 @@ var config = { // 'linktosalesforce', // 'livestreaming', // 'microphone', - // 'mute-everyone', - // 'mute-video-everyone', // 'participants-pane', // 'profile', // 'raisehand', diff --git a/react/features/toolbox/components/MuteEveryoneButton.js b/react/features/toolbox/components/MuteEveryoneButton.js deleted file mode 100644 index 64ea1cb08..000000000 --- a/react/features/toolbox/components/MuteEveryoneButton.js +++ /dev/null @@ -1,69 +0,0 @@ -// @flow - -import { createToolbarEvent, sendAnalytics } from '../../analytics'; -import { openDialog } from '../../base/dialog'; -import { translate } from '../../base/i18n'; -import { IconMuteEveryone } from '../../base/icons'; -import { getLocalParticipant, isLocalParticipantModerator } from '../../base/participants'; -import { connect } from '../../base/redux'; -import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components'; -import { MuteEveryoneDialog } from '../../video-menu/components'; - -type Props = AbstractButtonProps & { - - /** - * The Redux dispatch function. - */ - dispatch: Function, - - /** - * The ID of the local participant. - */ - localParticipantId: string -}; - -/** - * Implements a React {@link Component} which displays a button for audio muting - * every participant (except the local one). - */ -class MuteEveryoneButton extends AbstractButton { - accessibilityLabel = 'toolbar.accessibilityLabel.muteEveryone'; - icon = IconMuteEveryone; - label = 'toolbar.muteEveryone'; - tooltip = 'toolbar.muteEveryone'; - - /** - * Handles clicking / pressing the button, and opens a confirmation dialog. - * - * @private - * @returns {void} - */ - _handleClick() { - const { dispatch, localParticipantId } = this.props; - - sendAnalytics(createToolbarEvent('mute.everyone.pressed')); - dispatch(openDialog(MuteEveryoneDialog, { - exclude: [ localParticipantId ] - })); - } -} - -/** - * Maps part of the redux state to the component's props. - * - * @param {Object} state - The redux store/state. - * @param {Props} ownProps - The component's own props. - * @returns {Object} - */ -function _mapStateToProps(state: Object, ownProps: Props) { - const localParticipant = getLocalParticipant(state); - const { disableRemoteMute } = state['features/base/config']; - const { visible = isLocalParticipantModerator(state) && !disableRemoteMute } = ownProps; - - return { - localParticipantId: localParticipant.id, - visible - }; -} - -export default translate(connect(_mapStateToProps)(MuteEveryoneButton)); diff --git a/react/features/toolbox/components/MuteEveryonesVideoButton.js b/react/features/toolbox/components/MuteEveryonesVideoButton.js deleted file mode 100644 index 6697370a4..000000000 --- a/react/features/toolbox/components/MuteEveryonesVideoButton.js +++ /dev/null @@ -1,69 +0,0 @@ -// @flow - -import { createToolbarEvent, sendAnalytics } from '../../analytics'; -import { openDialog } from '../../base/dialog'; -import { translate } from '../../base/i18n'; -import { IconMuteVideoEveryone } from '../../base/icons'; -import { getLocalParticipant, isLocalParticipantModerator } from '../../base/participants'; -import { connect } from '../../base/redux'; -import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components'; -import { MuteEveryonesVideoDialog } from '../../video-menu/components'; - -type Props = AbstractButtonProps & { - - /** - * The Redux dispatch function. - */ - dispatch: Function, - - /** - * The ID of the local participant. - */ - localParticipantId: string -}; - -/** - * Implements a React {@link Component} which displays a button for disabling the camera of - * every participant (except the local one). - */ -class MuteEveryonesVideoButton extends AbstractButton { - accessibilityLabel = 'toolbar.accessibilityLabel.muteEveryonesVideoStream'; - icon = IconMuteVideoEveryone; - label = 'toolbar.muteEveryonesVideo'; - tooltip = 'toolbar.muteEveryonesVideo'; - - /** - * Handles clicking / pressing the button, and opens a confirmation dialog. - * - * @private - * @returns {void} - */ - _handleClick() { - const { dispatch, localParticipantId } = this.props; - - sendAnalytics(createToolbarEvent('mute.everyone.pressed')); - dispatch(openDialog(MuteEveryonesVideoDialog, { - exclude: [ localParticipantId ] - })); - } -} - -/** - * Maps part of the redux state to the component's props. - * - * @param {Object} state - The redux store/state. - * @param {Props} ownProps - The component's own props. - * @returns {Object} - */ -function _mapStateToProps(state: Object, ownProps: Props) { - const localParticipant = getLocalParticipant(state); - const { disableRemoteMute } = state['features/base/config']; - const { visible = isLocalParticipantModerator(state) && !disableRemoteMute } = ownProps; - - return { - localParticipantId: localParticipant.id, - visible - }; -} - -export default translate(connect(_mapStateToProps)(MuteEveryonesVideoButton)); diff --git a/react/features/toolbox/components/web/Toolbox.js b/react/features/toolbox/components/web/Toolbox.js index 45b6feabd..bbc3789d4 100644 --- a/react/features/toolbox/components/web/Toolbox.js +++ b/react/features/toolbox/components/web/Toolbox.js @@ -84,8 +84,6 @@ import { isDesktopShareButtonDisabled, isToolboxVisible } from '../../functions' import DownloadButton from '../DownloadButton'; import HangupButton from '../HangupButton'; import HelpButton from '../HelpButton'; -import MuteEveryoneButton from '../MuteEveryoneButton'; -import MuteEveryonesVideoButton from '../MuteEveryonesVideoButton'; import AudioSettingsButton from './AudioSettingsButton'; import FullscreenButton from './FullscreenButton'; @@ -743,18 +741,6 @@ class Toolbox extends Component { group: 2 }; - const muteEveryone = { - key: 'mute-everyone', - Content: MuteEveryoneButton, - group: 2 - }; - - const muteVideoEveryone = { - key: 'mute-video-everyone', - Content: MuteEveryonesVideoButton, - group: 2 - }; - const shareVideo = { key: 'sharedvideo', Content: SharedVideoButton, @@ -839,8 +825,6 @@ class Toolbox extends Component { recording, livestreaming, linkToSalesforce, - muteEveryone, - muteVideoEveryone, shareVideo, shareAudio, etherpad,