imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets

Browse source 
 Conflicts:
	res/css/views/rooms/_AppsDrawer.scss
	src/components/views/elements/AppTile.js
	src/components/views/rooms/AppsDrawer.js
This commit is contained in:
Michael Telatynski 2020-10-14 10:23:44 +01:00
commit d36fafd0c6
5 changed files with 48 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/elements/AppTile.js
View file

@ -201,10 +201,14 @@ export default class AppTile extends React.Component {
this.iframe.src = 'about:blank';
}
if (WidgetType.JITSI.matches(this.props.app.type)) {
dis.dispatch({action: 'hangup_conference'});
}
// Delete the widget from the persisted store for good measure.
PersistedElement.destroyElement(this._persistKey);
this._sgWidget.stop();
this._sgWidget.stop({forceDestroy: true});
}
_onWidgetPrepared = () => {