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

Linting

Browse Source
This commit is contained in:
Kegan Dougal
2017-07-06 10:44:32 +01:00
parent e0e321783b
commit 42ba3ff410
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,11 +65,10 @@ export default React.createClass({
this._scalarClient = new ScalarAuthClient(); this._scalarClient = new ScalarAuthClient();
this._scalarClient.getScalarToken().done((token) => { this._scalarClient.getScalarToken().done((token) => {
// Append scalar_token as a query param // Append scalar_token as a query param
let u = url.parse(this.props.url); const u = url.parse(this.props.url);
if (!u.search) { if (!u.search) {
u.search = "?scalar_token=" + encodeURIComponent(token); u.search = "?scalar_token=" + encodeURIComponent(token);
} } else {
else {
u.search += "&scalar_token=" + encodeURIComponent(token); u.search += "&scalar_token=" + encodeURIComponent(token);
} }
@@ -127,8 +126,7 @@ export default React.createClass({
appTileBody = ( appTileBody = (
<div> Loading... </div> <div> Loading... </div>
); );
} } else {
else {
appTileBody = ( appTileBody = (
<div className="mx_AppTileBody"> <div className="mx_AppTileBody">
<iframe ref="appFrame" src={this.state.widgetUrl} allowFullScreen="true"></iframe> <iframe ref="appFrame" src={this.state.widgetUrl} allowFullScreen="true"></iframe>