From 56581ef408574f7ae1883c4de0a565deb63fe00c Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 8 Nov 2017 20:38:31 +0000
Subject: [PATCH] Fix various loadingElement related issues.

---
 src/components/views/elements/AppTile.js | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index ddf0f0f6a8..cd1f351e19 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -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}