Browse Source

feat(native-participants-pane) removed everyonemoderator from footer context menu

master
Calin Chitu 4 years ago
parent
commit
8c20dd8e47

+ 2
- 2
react/features/participants-pane/components/native/ContextMenuMeetingParticipantDetails.js View File

172
                 _isLocalModerator && (
172
                 _isLocalModerator && (
173
                     <>
173
                     <>
174
                         {
174
                         {
175
-                            _isParticipantVideoMuted
176
-                            || <TouchableOpacity
175
+                            !_isParticipantVideoMuted
176
+                            && <TouchableOpacity
177
                                 onPress = { muteVideo }
177
                                 onPress = { muteVideo }
178
                                 style = { styles.contextMenuItemSection }>
178
                                 style = { styles.contextMenuItemSection }>
179
                                 <Icon
179
                                 <Icon

+ 2
- 3
react/features/participants-pane/components/native/ContextMenuMore.js View File

14
 } from '../../../base/icons';
14
 } from '../../../base/icons';
15
 import {
15
 import {
16
     getLocalParticipant,
16
     getLocalParticipant,
17
-    getParticipantCount, isEveryoneModerator
17
+    getParticipantCount
18
 } from '../../../base/participants';
18
 } from '../../../base/participants';
19
 import { BlockAudioVideoDialog } from '../../../video-menu';
19
 import { BlockAudioVideoDialog } from '../../../video-menu';
20
 import MuteEveryonesVideoDialog
20
 import MuteEveryonesVideoDialog
27
     const blockAudioVideo = useCallback(() => dispatch(openDialog(BlockAudioVideoDialog)), [ dispatch ]);
27
     const blockAudioVideo = useCallback(() => dispatch(openDialog(BlockAudioVideoDialog)), [ dispatch ]);
28
     const cancel = useCallback(() => dispatch(hideDialog()), [ dispatch ]);
28
     const cancel = useCallback(() => dispatch(hideDialog()), [ dispatch ]);
29
     const { id } = useSelector(getLocalParticipant);
29
     const { id } = useSelector(getLocalParticipant);
30
-    const everyoneModerator = useSelector(isEveryoneModerator);
31
     const participantsCount = useSelector(getParticipantCount);
30
     const participantsCount = useSelector(getParticipantCount);
32
-    const showSlidingView = !everyoneModerator && participantsCount > 2;
31
+    const showSlidingView = participantsCount > 2;
33
     const muteAllVideo = useCallback(() =>
32
     const muteAllVideo = useCallback(() =>
34
         dispatch(openDialog(MuteEveryonesVideoDialog,
33
         dispatch(openDialog(MuteEveryonesVideoDialog,
35
             { exclude: [ id ] })),
34
             { exclude: [ id ] })),

+ 1
- 2
react/features/participants-pane/components/native/MeetingParticipantList.js View File

27
     const participants = useSelector(getRemoteParticipants);
27
     const participants = useSelector(getRemoteParticipants);
28
     const participantsCount = useSelector(getParticipantCountWithFake);
28
     const participantsCount = useSelector(getParticipantCountWithFake);
29
     const showInviteButton = useSelector(shouldRenderInviteButton);
29
     const showInviteButton = useSelector(shouldRenderInviteButton);
30
-
31
     const { t } = useTranslation();
30
     const { t } = useTranslation();
32
 
31
 
33
     // eslint-disable-next-line react/no-multi-comp
32
     // eslint-disable-next-line react/no-multi-comp
35
         <MeetingParticipantItem
34
         <MeetingParticipantItem
36
             key = { id }
35
             key = { id }
37
             /* eslint-disable-next-line react/jsx-no-bind */
36
             /* eslint-disable-next-line react/jsx-no-bind */
38
-            onPress = { () => !localParticipant && dispatch(showContextMenuDetails(id)) }
37
+            onPress = { () => dispatch(showContextMenuDetails(id)) }
39
             participantID = { id } />
38
             participantID = { id } />
40
     );
39
     );
41
 
40
 

+ 1
- 3
react/features/participants-pane/components/native/ParticipantsPane.js View File

11
 import { JitsiModal } from '../../../base/modal';
11
 import { JitsiModal } from '../../../base/modal';
12
 import {
12
 import {
13
     getParticipantCount,
13
     getParticipantCount,
14
-    isEveryoneModerator,
15
     isLocalParticipantModerator
14
     isLocalParticipantModerator
16
 } from '../../../base/participants';
15
 } from '../../../base/participants';
17
 import MuteEveryoneDialog
16
 import MuteEveryoneDialog
34
     const closePane = useCallback(() => dispatch(close()), [ dispatch ]);
33
     const closePane = useCallback(() => dispatch(close()), [ dispatch ]);
35
     const isLocalModerator = useSelector(isLocalParticipantModerator);
34
     const isLocalModerator = useSelector(isLocalParticipantModerator);
36
     const participantsCount = useSelector(getParticipantCount);
35
     const participantsCount = useSelector(getParticipantCount);
37
-    const everyoneModerator = useSelector(isEveryoneModerator);
38
-    const showContextMenu = !everyoneModerator && participantsCount > 2;
36
+    const showContextMenu = participantsCount > 2;
39
     const muteAll = useCallback(() => dispatch(openDialog(MuteEveryoneDialog)),
37
     const muteAll = useCallback(() => dispatch(openDialog(MuteEveryoneDialog)),
40
         [ dispatch ]);
38
         [ dispatch ]);
41
     const { t } = useTranslation();
39
     const { t } = useTranslation();

Loading…
Cancel
Save