diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js index fbe719710b..4bd9cb669c 100644 --- a/src/components/views/dialogs/ConfirmUserActionDialog.js +++ b/src/components/views/dialogs/ConfirmUserActionDialog.js @@ -31,22 +31,40 @@ export default React.createClass({ propTypes: { member: React.PropTypes.object.isRequired, // matrix-js-sdk member object action: React.PropTypes.string.isRequired, // eg. 'Ban' + + // Whether to display a text field for a reason + // If true, the second argument to onFinished will + // be the string entered. + askReason: React.PropTypes.bool, danger: React.PropTypes.bool, onFinished: React.PropTypes.func.isRequired, }, defaultProps: { danger: false, + askReason: false, + }, + + componentWillMount: function() { + this._reasonField = null; }, onOk: function() { - this.props.onFinished(true); + let reason; + if (this._reasonField) { + reason = this._reasonField.value; + } + this.props.onFinished(true, reason); }, onCancel: function() { this.props.onFinished(false); }, + _collectReasonField: function(e) { + this._reasonField = e; + }, + render: function() { const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar"); @@ -56,8 +74,24 @@ export default React.createClass({ 'mx_Dialog_primary': true, 'danger': this.props.danger, }); + + let reasonBox; + if (this.props.askReason) { + reasonBox = ( +
+
+ +
+
+ ); + } + return ( - @@ -68,8 +102,11 @@ export default React.createClass({
{this.props.member.name}
{this.props.member.userId}
+ {reasonBox}
- diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js index 699ee8a3a2..0c54565b9d 100644 --- a/src/components/views/rooms/MemberInfo.js +++ b/src/components/views/rooms/MemberInfo.js @@ -222,13 +222,15 @@ module.exports = WithMatrixClient(React.createClass({ Modal.createDialog(ConfirmUserActionDialog, { member: this.props.member, action: 'Kick', + askReason: true, danger: true, - onFinished: (proceed) => { + onFinished: (proceed, reason) => { if (!proceed) return; this.setState({ updating: this.state.updating + 1 }); this.props.matrixClient.kick( this.props.member.roomId, this.props.member.userId, + reason || undefined ).then(function() { // NO-OP; rely on the m.room.member event coming down else we could // get out of sync if we force setState here! @@ -252,8 +254,9 @@ module.exports = WithMatrixClient(React.createClass({ Modal.createDialog(ConfirmUserActionDialog, { member: this.props.member, action: this.props.member.membership == 'ban' ? 'Unban' : 'Ban', + askReason: this.props.member.membership != 'ban', danger: this.props.member.membership != 'ban', - onFinished: (proceed) => { + onFinished: (proceed, reason) => { if (!proceed) return; this.setState({ updating: this.state.updating + 1 }); @@ -265,6 +268,7 @@ module.exports = WithMatrixClient(React.createClass({ } else { promise = this.props.matrixClient.ban( this.props.member.roomId, this.props.member.userId, + reason || undefined ); } promise.then(