PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5184 from matrix-org/dbkr/always_allow_local_widgets

Browse source 
Always allow widgets when using the local version
This commit is contained in:
David Baker 2020-09-09 15:52:31 +01:00 committed by GitHub
commit 62556c2afe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,6 +102,8 @@ export default class AppTile extends React.Component {
_getNewState(newProps) { _getNewState(newProps) {
// This is a function to make the impact of calling SettingsStore slightly less // This is a function to make the impact of calling SettingsStore slightly less
const hasPermissionToLoad = () => { const hasPermissionToLoad = () => {
if (this._usingLocalWidget()) return true;
const currentlyAllowedWidgets = SettingsStore.getValue("allowedWidgets", newProps.room.roomId); const currentlyAllowedWidgets = SettingsStore.getValue("allowedWidgets", newProps.room.roomId);
return !!currentlyAllowedWidgets[newProps.app.eventId]; return !!currentlyAllowedWidgets[newProps.app.eventId];
}; };
@ -604,6 +606,15 @@ export default class AppTile extends React.Component {
return uriFromTemplate(u, vars); return uriFromTemplate(u, vars);
} }
/**
* Whether we're using a local version of the widget rather than loading the
* actual widget URL
* @returns {bool} true If using a local version of the widget
*/
_usingLocalWidget() {
return WidgetType.JITSI.matches(this.props.app.type);
}
/** /**
* Get the URL used in the iframe * Get the URL used in the iframe
* In cases where we supply our own UI for a widget, this is an internal * In cases where we supply our own UI for a widget, this is an internal