Fix comparison and handle case where app has permission to load but content is mixed protocol.

pull/21833/head
Richard Lewis 2017-08-01 17:48:02 +01:00
parent d29610bdd2
commit f0224460d2
1 changed files with 20 additions and 18 deletions

View File

@ -209,6 +209,15 @@ export default React.createClass({
</div> </div>
); );
} else if (this.state.hasPermissionToLoad == true) { } else if (this.state.hasPermissionToLoad == true) {
if (this.isMixedContent()) {
appTileBody = (
<div className="mx_AppTileBody">
<AppWarning
errorMsg="Error - Mixed content"
/>
</div>
);
} else {
appTileBody = ( appTileBody = (
<div className="mx_AppTileBody"> <div className="mx_AppTileBody">
<iframe <iframe
@ -219,14 +228,7 @@ export default React.createClass({
></iframe> ></iframe>
</div> </div>
); );
} else if (this.isMixedContent()) { }
appTileBody = (
<div className="mx_AppTileBody">
<AppWarning
errorMsg="Error - Mixed content"
/>
</div>
);
} else { } else {
appTileBody = ( appTileBody = (
<div className="mx_AppTileBody"> <div className="mx_AppTileBody">