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

Merge pull request #4323 from matrix-org/dbkr/use_own_jitsi_widget_for_popout

Browse source 
Use our own jitsi widget for the popout URL
This commit is contained in:
David Baker 2020-04-01 14:07:53 +01:00 • committed by GitHub
commit 144c657b61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -591,7 +591,13 @@ export default class AppTile extends React.Component {
} }
_getPopoutUrl() { _getPopoutUrl() {
return this._templatedUrl(this._getSafeUrl(this.props.app.url)); if (this.props.app.type === 'jitsi') {
return WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false});
} else {
// use app.url, not state.widgetUrl, because we want the one without
// the wURL params for the popped-out version.
return this._templatedUrl(this._getSafeUrl(this.props.app.url));
}
} }
_getSafeUrl(u) { _getSafeUrl(u) {