OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1321 from matrix-org/rxl881/warnings 

Only render appTile body (including warnings) if drawer shown.
pull/21833/head
Richard Lewis 2017-08-18 18:43:21 +01:00 committed by GitHub
parent e32c499298 1862057695
commit 388d8141ae
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,7 @@ export default React.createClass({
safeWidgetUrl = url.format(parsedWidgetUrl);
}
if (this.props.show) {
if (this.state.loading) {
appTileBody = (
<div className='mx_AppTileBody mx_AppLoading'>
@ -238,7 +239,7 @@ export default React.createClass({
/>
</div>
);
} else if (this.props.show) {
} else {
appTileBody = (
<div className="mx_AppTileBody">
<iframe
@ -260,6 +261,7 @@ export default React.createClass({
</div>
);
}
}
// editing is done in scalar
const showEditButton = Boolean(this._scalarClient && this._canUserModify());