Merge pull request #1884 from matrix-org/luke/fix-glitchy-widget-spinner

Fix issue incorrect positioning with widget loading indicator
pull/21833/head
Luke Barnard 2018-05-09 16:52:11 +01:00 committed by GitHub
commit bcf003757c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

@ -539,7 +539,11 @@ export default class AppTile extends React.Component {
</div> </div>
); );
if (this.state.initialising) { if (this.state.initialising) {
appTileBody = loadingElement; appTileBody = (
<div className={'mx_AppTileBody ' + (this.state.loading ? 'mx_AppLoading' : '')}>
{ loadingElement }
</div>
);
} else if (this.state.hasPermissionToLoad == true) { } else if (this.state.hasPermissionToLoad == true) {
if (this.isMixedContent()) { if (this.isMixedContent()) {
appTileBody = ( appTileBody = (