Don't mark the conference as loaded early
Wait until the joined event.
This commit is contained in:
parent
289c1ef506
commit
eec6a270c5
|
@ -109,8 +109,6 @@ class Conference extends Component<Props, State> {
|
||||||
};
|
};
|
||||||
|
|
||||||
this._ref = React.createRef();
|
this._ref = React.createRef();
|
||||||
|
|
||||||
this._onIframeLoad = this._onIframeLoad.bind(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -235,7 +233,6 @@ class Conference extends Component<Props, State> {
|
||||||
|
|
||||||
this._api = new JitsiMeetExternalAPI(host, {
|
this._api = new JitsiMeetExternalAPI(host, {
|
||||||
configOverwrite,
|
configOverwrite,
|
||||||
onload: this._onIframeLoad,
|
|
||||||
parentNode,
|
parentNode,
|
||||||
roomName: this._conference.room
|
roomName: this._conference.room
|
||||||
});
|
});
|
||||||
|
@ -286,19 +283,6 @@ class Conference extends Component<Props, State> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_onIframeLoad: (*) => void;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets state of loading to false when iframe has completely loaded.
|
|
||||||
*
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
_onIframeLoad() {
|
|
||||||
this.setState({
|
|
||||||
isLoading: false
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Saves conference info on joining it.
|
* Saves conference info on joining it.
|
||||||
*
|
*
|
||||||
|
@ -307,6 +291,10 @@ class Conference extends Component<Props, State> {
|
||||||
* @returns {void}
|
* @returns {void}
|
||||||
*/
|
*/
|
||||||
_onVideoConferenceJoined(conferenceInfo: Object) {
|
_onVideoConferenceJoined(conferenceInfo: Object) {
|
||||||
|
this.setState({
|
||||||
|
isLoading: false
|
||||||
|
});
|
||||||
|
|
||||||
setupDragAreas(this._api.getIFrame());
|
setupDragAreas(this._api.getIFrame());
|
||||||
|
|
||||||
this._setAvatarURL(this.props._avatarURL);
|
this._setAvatarURL(this.props._avatarURL);
|
||||||
|
|
Loading…
Reference in New Issue