PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

A manual address doesn't have to be converted to an address tile before it can be used if it is the still in the input field when the start/invite button is pressed

Browse source
This commit is contained in:
wmwragg 2016-09-14 15:09:23 +01:00
parent 2a8518b72b
commit a7a81c8a32
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/components/views/dialogs/ChatInviteDialog.js
View file

@ -71,10 +71,21 @@ module.exports = React.createClass({
}, },
onButtonClick: function() { onButtonClick: function() {
if (this.state.inviteList.length > 0) { var inviteList = this.state.inviteList.slice();
// Check the text input field to see if user has an unconverted address
// If there is and it's valid add it to the local inviteList
var check = Invite.isValidAddress(this.refs.textinput.value);
if (check === true || check === null) {
inviteList.push(this.refs.textinput.value);
} else if (this.refs.textinput.value.length > 0) {
this.setState({ error: true });
return;
}
if (inviteList.length > 0) {
if (this._isDmChat()) { if (this._isDmChat()) {
// Direct Message chat // Direct Message chat
var room = this._getDirectMessageRoom(this.state.inviteList[0]); var room = this._getDirectMessageRoom(inviteList[0]);
if (room) { if (room) {
// A Direct Message room already exists for this user and you // A Direct Message room already exists for this user and you
// so go straight to that room // so go straight to that room
@ -82,13 +93,13 @@ module.exports = React.createClass({
action: 'view_room', action: 'view_room',
room_id: room.roomId, room_id: room.roomId,
}); });
this.props.onFinished(true, this.state.inviteList[0]); this.props.onFinished(true, inviteList[0]);
} else { } else {
this._startChat(this.state.inviteList); this._startChat(inviteList);
} }
} else { } else {
// Multi invite chat // Multi invite chat
this._startChat(this.state.inviteList); this._startChat(inviteList);
} }
} else { } else {
// No addresses supplied // No addresses supplied