Bladeren bron

fix(info): show dialog after joining the conference

Delay showing the dialog until after joining the conference
instead of as soon as possible. This resolves a few issues.
One is the dialog displaying right before the permissions
overlay is shown. Another is that logically it does not
make sense to show the invite options when unable to invite.
It also sidesteps the initial react UI bootstrapping that
can cause race conditions with toolbar re-renders causing
misalignment. Lastly, it prepares prematurely for what I
assume will be changes for when the info dialog will
actually be shown automatically.
master
Leonard Kim 8 jaren geleden
bovenliggende
commit
f539240840
2 gewijzigde bestanden met toevoegingen van 6 en 4 verwijderingen
  1. 6
    0
      react/features/invite/middleware.js
  2. 0
    4
      react/features/invite/reducer.js

+ 6
- 0
react/features/invite/middleware.js Bestand weergeven

1
+import { CONFERENCE_JOINED } from '../base/conference';
1
 import { MiddlewareRegistry } from '../base/redux';
2
 import { MiddlewareRegistry } from '../base/redux';
2
 
3
 
4
+import { setInfoDialogVisibility } from './actions';
3
 import { UPDATE_DIAL_IN_NUMBERS_FAILED } from './actionTypes';
5
 import { UPDATE_DIAL_IN_NUMBERS_FAILED } from './actionTypes';
4
 
6
 
5
 const logger = require('jitsi-meet-logger').getLogger(__filename);
7
 const logger = require('jitsi-meet-logger').getLogger(__filename);
15
     const result = next(action);
17
     const result = next(action);
16
 
18
 
17
     switch (action.type) {
19
     switch (action.type) {
20
+    case CONFERENCE_JOINED:
21
+        store.dispatch(setInfoDialogVisibility(true));
22
+        break;
23
+
18
     case UPDATE_DIAL_IN_NUMBERS_FAILED:
24
     case UPDATE_DIAL_IN_NUMBERS_FAILED:
19
         logger.error(
25
         logger.error(
20
             'Error encountered while fetching dial-in numbers:',
26
             'Error encountered while fetching dial-in numbers:',

+ 0
- 4
react/features/invite/reducer.js Bestand weergeven

7
 } from './actionTypes';
7
 } from './actionTypes';
8
 
8
 
9
 const DEFAULT_STATE = {
9
 const DEFAULT_STATE = {
10
-
11
-    // By default show the info dialog when joining the conference.
12
-    infoDialogVisible: true,
13
-
14
     numbersEnabled: true
10
     numbersEnabled: true
15
 };
11
 };
16
 
12
 

Laden…
Annuleren
Opslaan