matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-17 17:42:41 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Richard Lewis
2017-08-01 17:48:02 +01:00
parent d29610bdd2
commit f0224460d2
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,24 +209,26 @@ export default React.createClass({
</div> </div>
); );
} else if (this.state.hasPermissionToLoad == true) { } else if (this.state.hasPermissionToLoad == true) {
appTileBody = ( if (this.isMixedContent()) {
<div className="mx_AppTileBody"> appTileBody = (
<iframe <div className="mx_AppTileBody">
ref="appFrame" <AppWarning
src={safeWidgetUrl} errorMsg="Error - Mixed content"
allowFullScreen="true" />
sandbox={sandboxFlags} </div>
></iframe> );
</div> } else {
); appTileBody = (
} else if (this.isMixedContent()) { <div className="mx_AppTileBody">
appTileBody = ( <iframe
<div className="mx_AppTileBody"> ref="appFrame"
<AppWarning src={safeWidgetUrl}
errorMsg="Error - Mixed content" allowFullScreen="true"
/> sandbox={sandboxFlags}
</div> ></iframe>
); </div>
);
}
} else { } else {
appTileBody = ( appTileBody = (
<div className="mx_AppTileBody"> <div className="mx_AppTileBody">