Moved the isValidAddress method to the Invite utilty object

pull/21833/head
wmwragg 2016-09-13 12:12:33 +01:00
parent 0b267763e2
commit cba76d651a
2 changed files with 18 additions and 18 deletions

View File

@ -43,3 +43,20 @@ export function inviteToRoom(roomId, addr) {
throw new Error('Unsupported address'); throw new Error('Unsupported address');
} }
} }
export function isValidAddress(addr) {
// Check if the addr is a valid type
var addrType = this.getAddressType(addr);
if (addrType === "mx") {
let user = MatrixClientPeg.get().getUser(addr);
if (user) {
return true;
} else {
return false;
}
} else if (addrType === "email") {
return true;
} else {
return false;
}
}

View File

@ -122,7 +122,7 @@ module.exports = React.createClass({
} else if (e.keyCode === 32 || e.keyCode === 188) { // space or comma } else if (e.keyCode === 32 || e.keyCode === 188) { // space or comma
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
if (this._isValidAddress(this.refs.textinput.value)) { if (Invite.isValidAddress(this.refs.textinput.value)) {
var inviteList = this.state.inviteList.slice(); var inviteList = this.state.inviteList.slice();
inviteList.push(this.refs.textinput.value); inviteList.push(this.refs.textinput.value);
this.setState({ this.setState({
@ -271,23 +271,6 @@ module.exports = React.createClass({
return false; return false;
}, },
_isValidAddress: function(addr) {
// Check if the addr is a valid type
var addrType = Invite.getAddressType(addr);
if (addrType === "mx") {
let user = MatrixClientPeg.get().getUser(addr);
if (user) {
return true;
} else {
return false;
}
} else if (addrType === "email") {
return true;
} else {
return false;
}
},
render: function() { render: function() {
var TintableSvg = sdk.getComponent("elements.TintableSvg"); var TintableSvg = sdk.getComponent("elements.TintableSvg");
var AddressSelector = sdk.getComponent("elements.AddressSelector"); var AddressSelector = sdk.getComponent("elements.AddressSelector");