Преглед изворни кода

config: remove unneeded option

master
Saúl Ibarra Corretgé пре 5 година
родитељ
комит
9cc05ef838
2 измењених фајлова са 7 додато и 29 уклоњено
  1. 0
    5
      config.js
  2. 7
    24
      react/features/toolbox/components/web/Toolbox.js

+ 0
- 5
config.js Прегледај датотеку

264
     // a call is hangup.
264
     // a call is hangup.
265
     // enableClosePage: false,
265
     // enableClosePage: false,
266
 
266
 
267
-    // Enabling pre join page will add an additional step before starting the meeting,
268
-    // where the user can configure its devices and choose the way he
269
-    // joins audio (by phone/or web).
270
-    // prejoinPageEnabled: false,
271
-
272
     // Disable hiding of remote thumbnails when in a 1-on-1 conference call.
267
     // Disable hiding of remote thumbnails when in a 1-on-1 conference call.
273
     // disable1On1Mode: false,
268
     // disable1On1Mode: false,
274
 
269
 

+ 7
- 24
react/features/toolbox/components/web/Toolbox.js Прегледај датотеку

71
     setOverflowMenuVisible,
71
     setOverflowMenuVisible,
72
     setToolbarHovered
72
     setToolbarHovered
73
 } from '../../actions';
73
 } from '../../actions';
74
-import AudioMuteButton from '../AudioMuteButton';
75
 import AudioSettingsButton from './AudioSettingsButton';
74
 import AudioSettingsButton from './AudioSettingsButton';
76
 import DownloadButton from '../DownloadButton';
75
 import DownloadButton from '../DownloadButton';
77
 import { isToolboxVisible } from '../../functions';
76
 import { isToolboxVisible } from '../../functions';
81
 import OverflowMenuProfileItem from './OverflowMenuProfileItem';
80
 import OverflowMenuProfileItem from './OverflowMenuProfileItem';
82
 import MuteEveryoneButton from './MuteEveryoneButton';
81
 import MuteEveryoneButton from './MuteEveryoneButton';
83
 import ToolbarButton from './ToolbarButton';
82
 import ToolbarButton from './ToolbarButton';
84
-import VideoMuteButton from '../VideoMuteButton';
85
 import VideoSettingsButton from './VideoSettingsButton';
83
 import VideoSettingsButton from './VideoSettingsButton';
86
 import {
84
 import {
87
     ClosedCaptionButton
85
     ClosedCaptionButton
128
      */
126
      */
129
     _fullScreen: boolean,
127
     _fullScreen: boolean,
130
 
128
 
131
-    /**
132
-     * Whether or not the prejoin page is enabled.
133
-     */
134
-    _prejoinPageEnabled: boolean,
135
-
136
     /**
129
     /**
137
      * Whether or not the tile view is enabled.
130
      * Whether or not the tile view is enabled.
138
      */
131
      */
1130
      */
1123
      */
1131
     _renderAudioButton() {
1124
     _renderAudioButton() {
1132
         return this._shouldShowButton('microphone')
1125
         return this._shouldShowButton('microphone')
1133
-            ? this.props._prejoinPageEnabled
1134
-                ? <AudioSettingsButton
1135
-                    key = 'asb'
1136
-                    visible = { true } />
1137
-                : <AudioMuteButton
1138
-                    key = 'amb'
1139
-                    visible = { true } />
1126
+            ? <AudioSettingsButton
1127
+                key = 'asb'
1128
+                visible = { true } />
1140
             : null;
1129
             : null;
1141
     }
1130
     }
1142
 
1131
 
1147
      */
1136
      */
1148
     _renderVideoButton() {
1137
     _renderVideoButton() {
1149
         return this._shouldShowButton('camera')
1138
         return this._shouldShowButton('camera')
1150
-            ? this.props._prejoinPageEnabled
1151
-                ? <VideoSettingsButton
1152
-                    key = 'vsb'
1153
-                    visible = { true } />
1154
-                : <VideoMuteButton
1155
-                    key = 'vmb'
1156
-                    visible = { true } />
1139
+            ? <VideoSettingsButton
1140
+                key = 'vsb'
1141
+                visible = { true } />
1157
             : null;
1142
             : null;
1158
     }
1143
     }
1159
 
1144
 
1343
     const {
1328
     const {
1344
         callStatsID,
1329
         callStatsID,
1345
         enableFeaturesBasedOnToken,
1330
         enableFeaturesBasedOnToken,
1346
-        iAmRecorder,
1347
-        prejoinPageEnabled
1331
+        iAmRecorder
1348
     } = state['features/base/config'];
1332
     } = state['features/base/config'];
1349
     const sharedVideoStatus = state['features/shared-video'].status;
1333
     const sharedVideoStatus = state['features/shared-video'].status;
1350
     const {
1334
     const {
1395
         _localParticipantID: localParticipant.id,
1379
         _localParticipantID: localParticipant.id,
1396
         _localRecState: localRecordingStates,
1380
         _localRecState: localRecordingStates,
1397
         _overflowMenuVisible: overflowMenuVisible,
1381
         _overflowMenuVisible: overflowMenuVisible,
1398
-        _prejoinPageEnabled: prejoinPageEnabled,
1399
         _raisedHand: localParticipant.raisedHand,
1382
         _raisedHand: localParticipant.raisedHand,
1400
         _screensharing: localVideo && localVideo.videoType === 'desktop',
1383
         _screensharing: localVideo && localVideo.videoType === 'desktop',
1401
         _sharingVideo: sharedVideoStatus === 'playing'
1384
         _sharingVideo: sharedVideoStatus === 'playing'

Loading…
Откажи
Сачувај