Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(conference) fix not loading with older server versions #931

Merged
merged 1 commit into from
Nov 24, 2023
Merged

fix(conference) fix not loading with older server versions #931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 5 additions & 20 deletions app/features/conference/components/Conference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ class Conference extends Component<Props, State> {

const options = {
configOverwrite,
onload: this._onIframeLoad,
parentNode: this._ref.current,
roomName,
sandbox: 'allow-scripts allow-same-origin allow-popups allow-forms'
Expand All @@ -241,6 +240,11 @@ class Conference extends Component<Props, State> {
...urlParameters
});

// This event is fired really early, at the same time as 'ready', but has been
// around for longer.
// TODO: remove after a while. -saghul
this._api.on('browserSupport', this._onIframeLoad);

this._api.on('suspendDetected', this._onVideoConferenceEnded);
this._api.on('readyToClose', this._onVideoConferenceEnded);
this._api.on('videoConferenceJoined',
Expand Down Expand Up @@ -323,25 +327,6 @@ class Conference extends Component<Props, State> {
this._loadTimer = null;
}

const frame = this._api.getIFrame();
const mainApp = frame.contentWindow.document.getElementById('react');

if (!mainApp) {
console.warn('Main application not loaded');

this._navigateToHome(

// $FlowFixMe
{
error: 'Loading error',
type: 'error'
},
this._conference.room,
this._conference.serverURL);

return;
}

this.setState({
isLoading: false
});
Expand Down