From eec6a270c5b2c7c93891dee1f9b49cfd351f7cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Sun, 23 Sep 2018 10:29:25 +0200
Subject: [PATCH] Don't mark the conference as loaded early
Wait until the joined event.
---
.../conference/components/Conference.js | 20 ++++---------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/app/features/conference/components/Conference.js b/app/features/conference/components/Conference.js
index bd35aa3..421f04c 100644
--- a/app/features/conference/components/Conference.js
+++ b/app/features/conference/components/Conference.js
@@ -109,8 +109,6 @@ class Conference extends Component<Props, State> {
};
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, {
configOverwrite,
- onload: this._onIframeLoad,
parentNode,
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.
*
@@ -307,6 +291,10 @@ class Conference extends Component<Props, State> {
* @returns {void}
*/
_onVideoConferenceJoined(conferenceInfo: Object) {
+ this.setState({
+ isLoading: false
+ });
+
setupDragAreas(this._api.getIFrame());
this._setAvatarURL(this.props._avatarURL);
--
GitLab