PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix various loadingElement related issues.

Browse source
This commit is contained in:
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

14
src/components/views/elements/AppTile.js
View file

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