matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-17 17:42:41 +03:00
Code Activity

Only render appTile body (including warnings) if drawer shown.

Browse Source
This commit is contained in:
Richard Lewis
2017-08-18 18:33:56 +01:00
parent e32c499298
commit 1862057695
1 changed files with 32 additions and 30 deletions
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); safeWidgetUrl = url.format(parsedWidgetUrl);
} }
if (this.props.show) {
if (this.state.loading) { if (this.state.loading) {
appTileBody = ( appTileBody = (
<div className='mx_AppTileBody mx_AppLoading'> <div className='mx_AppTileBody mx_AppLoading'>
@@ -238,7 +239,7 @@ export default React.createClass({
/> />
</div> </div>
); );
} else if (this.props.show) { } else {
appTileBody = ( appTileBody = (
<div className="mx_AppTileBody"> <div className="mx_AppTileBody">
<iframe <iframe
@@ -260,6 +261,7 @@ export default React.createClass({
</div> </div>
); );
} }
}
// editing is done in scalar // editing is done in scalar
const showEditButton = Boolean(this._scalarClient && this._canUserModify()); const showEditButton = Boolean(this._scalarClient && this._canUserModify());