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

Small refactor to handle Direct Message chat as well as multi invite chat

pull/21833/head
wmwragg 2016-09-13 12:07:49 +01:00
parent ca2ba55288
commit 0b267763e2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/views/dialogs/ChatInviteDialog.js
View File

@ -70,7 +70,7 @@ module.exports = React.createClass({
this._updateUserList();
},
onStartChat: function() {
onButtonClick: function() {
var addr;
// Either an address tile was created, or text input is being used
@ -78,8 +78,8 @@ module.exports = React.createClass({
addr = this.state.inviteList[0];
}
// Check if the addr is a valid type
if (Invite.getAddressType(addr) === "mx") {
if (this.state.inviteList.length === 1 && Invite.getAddressType(addr) === "mx" && !this.props.roomId) {
// Direct Message chat
var room = this._getDirectMessageRoom(addr);
if (room) {
// A Direct Message room already exists for this user and you
@ -92,11 +92,9 @@ module.exports = React.createClass({
} else {
this._startChat(addr);
}
} else if (Invite.getAddressType(addr) === "email") {
this._startChat(addr);
} else {
// Nothing to do, so focus back on the textinput
this.refs.textinput.focus();
// Multi invite chat
this._startChat(addr);
}
},
@ -350,7 +348,7 @@ module.exports = React.createClass({
{ addressSelector }
</div>
<div className="mx_Dialog_buttons">
<button className="mx_Dialog_primary" onClick={this.onStartChat}>
<button className="mx_Dialog_primary" onClick={this.onButtonClick}>
{this.props.button}
</button>
</div>