Browse Source

Prevent undefined JitsiMeetJS

j8
Lyubo Marinov 8 years ago
parent
commit
c1b9b7a623

+ 1
- 3
react/features/base/conference/actions.js View File

1
-import JitsiMeetJS from '../lib-jitsi-meet';
1
+import { JitsiConferenceEvents } from '../lib-jitsi-meet';
2
 import {
2
 import {
3
     changeParticipantEmail,
3
     changeParticipantEmail,
4
     dominantSpeakerChanged,
4
     dominantSpeakerChanged,
30
  * @returns {void}
30
  * @returns {void}
31
  */
31
  */
32
 function _addConferenceListeners(conference, dispatch) {
32
 function _addConferenceListeners(conference, dispatch) {
33
-    const JitsiConferenceEvents = JitsiMeetJS.events.conference;
34
-
35
     conference.on(
33
     conference.on(
36
             JitsiConferenceEvents.CONFERENCE_FAILED,
34
             JitsiConferenceEvents.CONFERENCE_FAILED,
37
             (...args) => dispatch(conferenceFailed(conference, ...args)));
35
             (...args) => dispatch(conferenceFailed(conference, ...args)));

+ 1
- 3
react/features/base/conference/functions.js View File

1
-import JitsiMeetJS from '../lib-jitsi-meet';
2
-
3
-const JitsiTrackErrors = JitsiMeetJS.errors.track;
1
+import { JitsiTrackErrors } from '../lib-jitsi-meet';
4
 
2
 
5
 /**
3
 /**
6
  * Attach a set of local tracks to a conference.
4
  * Attach a set of local tracks to a conference.

+ 1
- 2
react/features/base/conference/reducer.js View File

1
-import JitsiMeetJS from '../lib-jitsi-meet';
1
+import { JitsiConferenceErrors } from '../lib-jitsi-meet';
2
 import {
2
 import {
3
     ReducerRegistry,
3
     ReducerRegistry,
4
     setStateProperties,
4
     setStateProperties,
64
         return state;
64
         return state;
65
     }
65
     }
66
 
66
 
67
-    const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
68
     const passwordRequired
67
     const passwordRequired
69
         = JitsiConferenceErrors.PASSWORD_REQUIRED === action.error
68
         = JitsiConferenceErrors.PASSWORD_REQUIRED === action.error
70
             ? conference
69
             ? conference

+ 1
- 3
react/features/base/connection/actions.native.js View File

3
 import type { Dispatch } from 'redux';
3
 import type { Dispatch } from 'redux';
4
 
4
 
5
 import { conferenceWillLeave } from '../conference';
5
 import { conferenceWillLeave } from '../conference';
6
-import JitsiMeetJS from '../lib-jitsi-meet';
6
+import JitsiMeetJS, { JitsiConnectionEvents } from '../lib-jitsi-meet';
7
 
7
 
8
 import {
8
 import {
9
     CONNECTION_DISCONNECTED,
9
     CONNECTION_DISCONNECTED,
12
     SET_DOMAIN
12
     SET_DOMAIN
13
 } from './actionTypes';
13
 } from './actionTypes';
14
 
14
 
15
-const JitsiConnectionEvents = JitsiMeetJS.events.connection;
16
-
17
 /**
15
 /**
18
  * Opens new connection.
16
  * Opens new connection.
19
  *
17
  *

+ 2
- 2
react/features/base/connection/actions.web.js View File

2
 
2
 
3
 import type { Dispatch } from 'redux';
3
 import type { Dispatch } from 'redux';
4
 
4
 
5
+import { JitsiConferenceEvents } from '../lib-jitsi-meet';
6
+
5
 import UIEvents from '../../../../service/UI/UIEvents';
7
 import UIEvents from '../../../../service/UI/UIEvents';
6
 
8
 
7
 import { SET_DOMAIN } from './actionTypes';
9
 import { SET_DOMAIN } from './actionTypes';
8
 
10
 
9
 declare var APP: Object;
11
 declare var APP: Object;
10
-declare var JitsiMeetJS: Object;
11
 
12
 
12
-const JitsiConferenceEvents = JitsiMeetJS.events.conference;
13
 const logger = require('jitsi-meet-logger').getLogger(__filename);
13
 const logger = require('jitsi-meet-logger').getLogger(__filename);
14
 
14
 
15
 export {
15
 export {

+ 1
- 3
react/features/base/lib-jitsi-meet/actions.js View File

1
-/* @flow */
2
-
3
 import type { Dispatch } from 'redux';
1
 import type { Dispatch } from 'redux';
4
 
2
 
5
-import JitsiMeetJS from './';
3
+import JitsiMeetJS from './_';
6
 import {
4
 import {
7
     LIB_DID_DISPOSE,
5
     LIB_DID_DISPOSE,
8
     LIB_DID_INIT,
6
     LIB_DID_INIT,

+ 10
- 0
react/features/base/lib-jitsi-meet/index.js View File

3
 import JitsiMeetJS from './_';
3
 import JitsiMeetJS from './_';
4
 export { JitsiMeetJS as default };
4
 export { JitsiMeetJS as default };
5
 
5
 
6
+// XXX Re-export the types exported by JitsiMeetJS in order to prevent undefined
7
+// imported JitsiMeetJS. It may be caused by import cycles but I have not
8
+// confirmed the theory.
9
+export const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
10
+export const JitsiConferenceEvents = JitsiMeetJS.events.conference;
11
+export const JitsiConnectionErrors = JitsiMeetJS.errors.connection;
12
+export const JitsiConnectionEvents = JitsiMeetJS.events.connection;
13
+export const JitsiTrackErrors = JitsiMeetJS.errors.track;
14
+export const JitsiTrackEvents = JitsiMeetJS.events.track;
15
+
6
 export * from './actions';
16
 export * from './actions';
7
 export * from './actionTypes';
17
 export * from './actionTypes';
8
 export * from './functions';
18
 export * from './functions';

+ 4
- 4
react/features/base/tracks/actions.js View File

1
-import JitsiMeetJS from '../lib-jitsi-meet';
1
+import JitsiMeetJS, {
2
+    JitsiTrackErrors,
3
+    JitsiTrackEvents
4
+} from '../lib-jitsi-meet';
2
 import {
5
 import {
3
     CAMERA_FACING_MODE,
6
     CAMERA_FACING_MODE,
4
     MEDIA_TYPE
7
     MEDIA_TYPE
11
     TRACK_UPDATED
14
     TRACK_UPDATED
12
 } from './actionTypes';
15
 } from './actionTypes';
13
 
16
 
14
-const JitsiTrackErrors = JitsiMeetJS.errors.track;
15
-const JitsiTrackEvents = JitsiMeetJS.events.track;
16
-
17
 /**
17
 /**
18
  * Request to start capturing local audio and/or video. By default, the user
18
  * Request to start capturing local audio and/or video. By default, the user
19
  * facing camera will be selected.
19
  * facing camera will be selected.

+ 4
- 4
react/features/overlay/reducer.js View File

3
     CONNECTION_ESTABLISHED,
3
     CONNECTION_ESTABLISHED,
4
     CONNECTION_FAILED
4
     CONNECTION_FAILED
5
 } from '../base/connection';
5
 } from '../base/connection';
6
-import JitsiMeetJS, {
7
-    isFatalJitsiConnectionError
6
+import {
7
+    isFatalJitsiConnectionError,
8
+    JitsiConferenceErrors,
9
+    JitsiConnectionErrors
8
 } from '../base/lib-jitsi-meet';
10
 } from '../base/lib-jitsi-meet';
9
 import {
11
 import {
10
     ReducerRegistry,
12
     ReducerRegistry,
17
     SUSPEND_DETECTED
19
     SUSPEND_DETECTED
18
 } from './actionTypes';
20
 } from './actionTypes';
19
 
21
 
20
-const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
21
-const JitsiConnectionErrors = JitsiMeetJS.errors.connection;
22
 const logger = require('jitsi-meet-logger').getLogger(__filename);
22
 const logger = require('jitsi-meet-logger').getLogger(__filename);
23
 
23
 
24
 /**
24
 /**

Loading…
Cancel
Save