matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Pass roomId rather than whole room object.

Browse Source
This commit is contained in:
Richard Lewis
2017-08-17 12:15:01 +01:00
parent eb77dcc8e3
commit d1ee257b5a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/elements/ManageIntegsButton.js
View File

@@ -61,7 +61,7 @@ export default class ManageIntegsButton extends React.Component {
const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager"); const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
Modal.createDialog(IntegrationsManager, { Modal.createDialog(IntegrationsManager, {
src: (this.scalarClient !== null && this.scalarClient.hasCredentials()) ? src: (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId) : this.scalarClient.getScalarInterfaceUrlForRoom(this.props.roomId) :
null, null,
onFinished: ()=>{ onFinished: ()=>{
if (this.props.onCancelClick) { if (this.props.onCancelClick) {
@@ -118,7 +118,7 @@ export default class ManageIntegsButton extends React.Component {
} }
ManageIntegsButton.propTypes = { ManageIntegsButton.propTypes = {
room: PropTypes.object.isRequired, roomId: PropTypes.string.isRequired,
onCancelClick: PropTypes.func, onCancelClick: PropTypes.func,
}; };

2
src/components/views/rooms/RoomHeader.js
View File

@@ -330,7 +330,7 @@ module.exports = React.createClass({
{ settingsButton } { settingsButton }
<ManageIntegsButton <ManageIntegsButton
onCancelClick={this.props.onCancelClick} onCancelClick={this.props.onCancelClick}
room={this.props.room} roomId={this.props.room.roomId}
/> />
{ forgetButton } { forgetButton }
{ searchButton } { searchButton }