matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-13 08:02:38 +03:00
Code Activity

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

Browse Source 
Fix issue incorrect positioning with widget loading indicator
This commit is contained in:
Luke Barnard
2018-05-09 16:52:11 +01:00
committed by GitHub
parent c81e1ec535 59cbaf67bb
commit bcf003757c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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