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

Fix various loadingElement related issues.

pull/21833/head
Richard Lewis 2017-11-08 20:38:31 +00:00
parent b2b07d9370
commit 56581ef408
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,24 +312,24 @@ export default React.createClass({
}
if (this.props.show) {
const loadingElement = (
<div className='mx_AppTileBody mx_AppLoading'>
<MessageSpinner msg='Loading...' />
</div>
);
if (this.state.initialising) {
appTileBody = (
<div className='mx_AppTileBody mx_AppLoading'>
<MessageSpinner msg='Loading...' />
</div>
);
appTileBody = loadingElement;
} else if (this.state.hasPermissionToLoad == true) {
const loadingElement = (
<div className="mx_AppTileBody">
<AppWarning errorMsg="Error - Mixed content" />
</div>
);
if (this.isMixedContent()) {
appTileBody = loadingElement;
appTileBody = (
<div className="mx_AppTileBody">
<AppWarning errorMsg="Error - Mixed content" />
</div>
);
} else {
appTileBody = (
<div className={this.loading ? 'mx_AppTileBody mx_AppLoading' : 'mx_AppTileBody'}>
{ this.loading && Element }
<div className={this.state.loading ? 'mx_AppTileBody mx_AppLoading' : 'mx_AppTileBody'}>
{ this.loading && loadingElement }
<iframe
ref="appFrame"
src={safeWidgetUrl}