Prevent undefined JitsiMeetJS
This commit is contained in:
parent
0b9160fb75
commit
c1b9b7a623
|
@ -1,4 +1,4 @@
|
||||||
import JitsiMeetJS from '../lib-jitsi-meet';
|
import { JitsiConferenceEvents } from '../lib-jitsi-meet';
|
||||||
import {
|
import {
|
||||||
changeParticipantEmail,
|
changeParticipantEmail,
|
||||||
dominantSpeakerChanged,
|
dominantSpeakerChanged,
|
||||||
|
@ -30,8 +30,6 @@ import { _addLocalTracksToConference } from './functions';
|
||||||
* @returns {void}
|
* @returns {void}
|
||||||
*/
|
*/
|
||||||
function _addConferenceListeners(conference, dispatch) {
|
function _addConferenceListeners(conference, dispatch) {
|
||||||
const JitsiConferenceEvents = JitsiMeetJS.events.conference;
|
|
||||||
|
|
||||||
conference.on(
|
conference.on(
|
||||||
JitsiConferenceEvents.CONFERENCE_FAILED,
|
JitsiConferenceEvents.CONFERENCE_FAILED,
|
||||||
(...args) => dispatch(conferenceFailed(conference, ...args)));
|
(...args) => dispatch(conferenceFailed(conference, ...args)));
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
import JitsiMeetJS from '../lib-jitsi-meet';
|
import { JitsiTrackErrors } from '../lib-jitsi-meet';
|
||||||
|
|
||||||
const JitsiTrackErrors = JitsiMeetJS.errors.track;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attach a set of local tracks to a conference.
|
* Attach a set of local tracks to a conference.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import JitsiMeetJS from '../lib-jitsi-meet';
|
import { JitsiConferenceErrors } from '../lib-jitsi-meet';
|
||||||
import {
|
import {
|
||||||
ReducerRegistry,
|
ReducerRegistry,
|
||||||
setStateProperties,
|
setStateProperties,
|
||||||
|
@ -64,7 +64,6 @@ function _conferenceFailed(state, action) {
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
||||||
const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
|
|
||||||
const passwordRequired
|
const passwordRequired
|
||||||
= JitsiConferenceErrors.PASSWORD_REQUIRED === action.error
|
= JitsiConferenceErrors.PASSWORD_REQUIRED === action.error
|
||||||
? conference
|
? conference
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
import type { Dispatch } from 'redux';
|
import type { Dispatch } from 'redux';
|
||||||
|
|
||||||
import { conferenceWillLeave } from '../conference';
|
import { conferenceWillLeave } from '../conference';
|
||||||
import JitsiMeetJS from '../lib-jitsi-meet';
|
import JitsiMeetJS, { JitsiConnectionEvents } from '../lib-jitsi-meet';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CONNECTION_DISCONNECTED,
|
CONNECTION_DISCONNECTED,
|
||||||
|
@ -12,8 +12,6 @@ import {
|
||||||
SET_DOMAIN
|
SET_DOMAIN
|
||||||
} from './actionTypes';
|
} from './actionTypes';
|
||||||
|
|
||||||
const JitsiConnectionEvents = JitsiMeetJS.events.connection;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Opens new connection.
|
* Opens new connection.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
import type { Dispatch } from 'redux';
|
import type { Dispatch } from 'redux';
|
||||||
|
|
||||||
|
import { JitsiConferenceEvents } from '../lib-jitsi-meet';
|
||||||
|
|
||||||
import UIEvents from '../../../../service/UI/UIEvents';
|
import UIEvents from '../../../../service/UI/UIEvents';
|
||||||
|
|
||||||
import { SET_DOMAIN } from './actionTypes';
|
import { SET_DOMAIN } from './actionTypes';
|
||||||
|
|
||||||
declare var APP: Object;
|
declare var APP: Object;
|
||||||
declare var JitsiMeetJS: Object;
|
|
||||||
|
|
||||||
const JitsiConferenceEvents = JitsiMeetJS.events.conference;
|
|
||||||
const logger = require('jitsi-meet-logger').getLogger(__filename);
|
const logger = require('jitsi-meet-logger').getLogger(__filename);
|
||||||
|
|
||||||
export {
|
export {
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
/* @flow */
|
|
||||||
|
|
||||||
import type { Dispatch } from 'redux';
|
import type { Dispatch } from 'redux';
|
||||||
|
|
||||||
import JitsiMeetJS from './';
|
import JitsiMeetJS from './_';
|
||||||
import {
|
import {
|
||||||
LIB_DID_DISPOSE,
|
LIB_DID_DISPOSE,
|
||||||
LIB_DID_INIT,
|
LIB_DID_INIT,
|
||||||
|
|
|
@ -3,6 +3,16 @@
|
||||||
import JitsiMeetJS from './_';
|
import JitsiMeetJS from './_';
|
||||||
export { JitsiMeetJS as default };
|
export { JitsiMeetJS as default };
|
||||||
|
|
||||||
|
// XXX Re-export the types exported by JitsiMeetJS in order to prevent undefined
|
||||||
|
// imported JitsiMeetJS. It may be caused by import cycles but I have not
|
||||||
|
// confirmed the theory.
|
||||||
|
export const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
|
||||||
|
export const JitsiConferenceEvents = JitsiMeetJS.events.conference;
|
||||||
|
export const JitsiConnectionErrors = JitsiMeetJS.errors.connection;
|
||||||
|
export const JitsiConnectionEvents = JitsiMeetJS.events.connection;
|
||||||
|
export const JitsiTrackErrors = JitsiMeetJS.errors.track;
|
||||||
|
export const JitsiTrackEvents = JitsiMeetJS.events.track;
|
||||||
|
|
||||||
export * from './actions';
|
export * from './actions';
|
||||||
export * from './actionTypes';
|
export * from './actionTypes';
|
||||||
export * from './functions';
|
export * from './functions';
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
import JitsiMeetJS from '../lib-jitsi-meet';
|
import JitsiMeetJS, {
|
||||||
|
JitsiTrackErrors,
|
||||||
|
JitsiTrackEvents
|
||||||
|
} from '../lib-jitsi-meet';
|
||||||
import {
|
import {
|
||||||
CAMERA_FACING_MODE,
|
CAMERA_FACING_MODE,
|
||||||
MEDIA_TYPE
|
MEDIA_TYPE
|
||||||
|
@ -11,9 +14,6 @@ import {
|
||||||
TRACK_UPDATED
|
TRACK_UPDATED
|
||||||
} from './actionTypes';
|
} from './actionTypes';
|
||||||
|
|
||||||
const JitsiTrackErrors = JitsiMeetJS.errors.track;
|
|
||||||
const JitsiTrackEvents = JitsiMeetJS.events.track;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Request to start capturing local audio and/or video. By default, the user
|
* Request to start capturing local audio and/or video. By default, the user
|
||||||
* facing camera will be selected.
|
* facing camera will be selected.
|
||||||
|
|
|
@ -3,8 +3,10 @@ import {
|
||||||
CONNECTION_ESTABLISHED,
|
CONNECTION_ESTABLISHED,
|
||||||
CONNECTION_FAILED
|
CONNECTION_FAILED
|
||||||
} from '../base/connection';
|
} from '../base/connection';
|
||||||
import JitsiMeetJS, {
|
import {
|
||||||
isFatalJitsiConnectionError
|
isFatalJitsiConnectionError,
|
||||||
|
JitsiConferenceErrors,
|
||||||
|
JitsiConnectionErrors
|
||||||
} from '../base/lib-jitsi-meet';
|
} from '../base/lib-jitsi-meet';
|
||||||
import {
|
import {
|
||||||
ReducerRegistry,
|
ReducerRegistry,
|
||||||
|
@ -17,8 +19,6 @@ import {
|
||||||
SUSPEND_DETECTED
|
SUSPEND_DETECTED
|
||||||
} from './actionTypes';
|
} from './actionTypes';
|
||||||
|
|
||||||
const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
|
|
||||||
const JitsiConnectionErrors = JitsiMeetJS.errors.connection;
|
|
||||||
const logger = require('jitsi-meet-logger').getLogger(__filename);
|
const logger = require('jitsi-meet-logger').getLogger(__filename);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue