haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(toolbar-buttons) Attempt fix Meet in integration

This commit is contained in:
hmuresan 2021-07-22 15:26:56 +03:00 committed by Horatiu Muresan
parent e91df47d1b
commit f4cde2192e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
react/features/toolbox/components/web/Toolbox.js
View File

@ -73,7 +73,7 @@ import {
setToolbarHovered, setToolbarHovered,
showToolbox showToolbox
} from '../../actions'; } from '../../actions';
import { THRESHOLDS } from '../../constants'; import { THRESHOLDS, NOT_APPLICABLE } from '../../constants';
import { isToolboxVisible } from '../../functions'; import { isToolboxVisible } from '../../functions';
import DownloadButton from '../DownloadButton'; import DownloadButton from '../DownloadButton';
import HangupButton from '../HangupButton'; import HangupButton from '../HangupButton';
@ -597,6 +597,7 @@ class Toolbox extends Component<Props> {
const participants = { const participants = {
key: 'participants-pane', key: 'participants-pane',
alias: 'invite',
Content: ParticipantsPaneButton, Content: ParticipantsPaneButton,
handleClick: this._onToolbarToggleParticipantsPane, handleClick: this._onToolbarToggleParticipantsPane,
group: 2 group: 2
@ -624,12 +625,7 @@ class Toolbox extends Component<Props> {
const security = { const security = {
key: 'security', key: 'security',
Content: SecurityDialogButton, alias: 'info',
group: 2
};
const info = {
key: 'info',
Content: SecurityDialogButton, Content: SecurityDialogButton,
group: 2 group: 2
}; };
@ -748,7 +744,6 @@ class Toolbox extends Component<Props> {
videoQuality, videoQuality,
fullscreen, fullscreen,
security, security,
info,
cc, cc,
recording, recording,
localRecording, localRecording,
@ -793,7 +788,8 @@ class Toolbox extends Component<Props> {
const filtered = [ const filtered = [
...order.map(key => buttons[key]), ...order.map(key => buttons[key]),
...Object.values(buttons).filter((button, index) => !order.includes(keys[index])) ...Object.values(buttons).filter((button, index) => !order.includes(keys[index]))
].filter(Boolean).filter(({ key }) => isToolbarButtonEnabled(key, _toolbarButtons)); ].filter(Boolean).filter(({ key, alias = NOT_APPLICABLE }) =>
isToolbarButtonEnabled(key, _toolbarButtons) || isToolbarButtonEnabled(alias, _toolbarButtons));
if (isHangupVisible) { if (isHangupVisible) {
sliceIndex -= 1; sliceIndex -= 1;

2
react/features/toolbox/constants.js
View File

@ -27,3 +27,5 @@ export const THRESHOLDS = [
order: [ 'microphone', 'camera' ] order: [ 'microphone', 'camera' ]
} }
]; ];
export const NOT_APPLICABLE = 'N/A';