matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate
2017-12-06 22:54:43 +00:00
parent 2c95055aaa ed675fe791
commit c3d6ff1e3b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,7 +217,7 @@ export default React.createClass({
if (nextProps.url !== this.props.url) { if (nextProps.url !== this.props.url) {
this._getNewState(nextProps); this._getNewState(nextProps);
this.setScalarToken(); this.setScalarToken();
} else if (nextProps.show && !this.props.show) { } else if (nextProps.show && !this.props.show && this.props.waitForIframeLoad) {
this.setState({ this.setState({
loading: true, loading: true,
}); });