matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-13 08:02:38 +03:00
Code Activity

Merge branch 'release-v0.12.4' into develop

Browse Source
This commit is contained in:
Luke Barnard
2018-05-14 14:31:18 +01:00
parent 615fc80c92 dddd1c43cc
commit 49a3770e92
5 changed files with 108 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,9 +364,7 @@ export default class AppTile extends React.Component {
if (!this.widgetMessaging) {
this._onInitialLoad();
}
if (this._exposeWidgetMessaging) {
this._exposeWidgetMessaging(this.widgetMessaging);
}
this.setState({loading: false});
}
/**
@@ -404,8 +402,6 @@ export default class AppTile extends React.Component {
}).catch((err) => {
console.log(`Failed to get capabilities for widget type ${this.props.type}`, this.props.id, err);
});
this.setState({loading: false});
}
_onWidgetAction(payload) {