matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-06-30 13:21:56 +03:00
Code Activity

factor out room-leaving code into MatrixChat for now, and add a dedicated leave button in to the header bar for now

Browse Source
This commit is contained in:
Matthew Hodgson
2015-12-13 13:49:28 +00:00
parent 43ab6074c9
commit 6ad6ed2a49
5 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/structures/RoomView.js
View File

@ -793,6 +793,14 @@ module.exports = React.createClass({
this.setState(this.getInitialState());
},
onLeaveClick: function() {
dis.dispatch({
action: 'leave_room',
room_id: this.props.roomId,
});
this.props.onFinished();
},
onRejectButtonClicked: function(ev) {
var self = this;
this.setState({
@ -853,7 +861,7 @@ module.exports = React.createClass({
// XXX: this is a bit of a hack and might possibly cause the video to push out the page anyway
// but it's better than the video going missing entirely
if (auxPanelMaxHeight < 50) auxPanelMaxHeight = 50;
video.style.maxHeight = auxPanelMaxHeight + "px";
}
},
@ -1039,7 +1047,7 @@ module.exports = React.createClass({
return (
<div className="mx_RoomView">
<RoomHeader ref="header" room={this.state.room} searchInfo={searchInfo} editing={this.state.editingRoomSettings} onSearchClick={this.onSearchClick}
onSettingsClick={this.onSettingsClick} onSaveClick={this.onSaveClick} onCancelClick={this.onCancelClick} />
onSettingsClick={this.onSettingsClick} onSaveClick={this.onSaveClick} onCancelClick={this.onCancelClick} onLeaveClick={this.onLeaveClick} />
{ fileDropTarget }
<div className="mx_RoomView_auxPanel">
<CallView ref="callView" room={this.state.room} ConferenceHandler={this.props.ConferenceHandler}/>