OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

AppsDrawer: Only append queryParams once

pull/21833/head
Robert Swain 2017-06-14 13:26:43 +02:00
parent 880e7149f3
commit 9c8ab2691b
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/views/rooms/AppsDrawer.js
View File

@ -50,13 +50,12 @@ module.exports = React.createClass({
switch(app.type) {
case 'etherpad':
app.url = app.url + '?userName=' + this.props.userId +
app.queryParams = '?userName=' + this.props.userId +
'&padId=' + this.props.room.roomId;
break;
case 'jitsi': {
const user = MatrixClientPeg.get().getUser(this.props.userId);
app.url = app.url +
'?confId=' + app.data.confId +
app.queryParams = '?confId=' + app.data.confId +
'&displayName=' + encodeURIComponent(user.displayName) +
'&avatarUrl=' + encodeURIComponent(MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl)) +
'&email=' + encodeURIComponent(this.props.userId) +
@ -181,15 +180,21 @@ module.exports = React.createClass({
render: function() {
const apps = this.state.apps.map(
(app, index, arr) => <AppTile
(app, index, arr) => {
let appUrl = app.url;
if (app.queryParams) {
appUrl += app.queryParams;
}
return <AppTile
key={app.name}
id={app.id}
url={app.url}
url={appUrl}
name={app.name}
fullWidth={arr.length<2 ? true : false}
room={this.props.room}
userId={this.props.userId}
/>);
/>;
});
const addWidget = this.state.apps && this.state.apps.length < 2 &&
(<div onClick={this.onClickAddWidget}