diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-07-02 09:32:31 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-07-02 09:32:31 -0400 |
commit | 7b6fe252f18b12107af105f9348da28f2f0d4a0c (patch) | |
tree | ec1e613fe8459e30e0c5fc30d18e6760f3132388 /web | |
parent | bd9b038c0007eeb3c1d27cae17c25169a04052a8 (diff) | |
download | chat-7b6fe252f18b12107af105f9348da28f2f0d4a0c.tar.gz chat-7b6fe252f18b12107af105f9348da28f2f0d4a0c.tar.bz2 chat-7b6fe252f18b12107af105f9348da28f2f0d4a0c.zip |
fix getDirectTeammate so that if teammate is the second id it doesn't return null
Diffstat (limited to 'web')
-rw-r--r-- | web/react/utils/utils.jsx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 530166f04..13cb0ff53 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -728,20 +728,22 @@ module.exports.isComment = function(post) { } module.exports.getDirectTeammate = function(channel_id) { - var userIds = ChannelStore.get(channel_id).name.split('__'); + var userIds = ChannelStore.get(channel_id).name.split('__'); + var curUserId = UserStore.getCurrentId(); + var teammate = {}; - if(userIds.length != 2) { - return; - } - - var curUser = UserStore.getCurrentId(); + if(userIds.length != 2 || userIds.indexOf(curUserId) === -1) { + return teammate; + } - for(var idx in userIds) { - if(userIds[idx] === curUser) - delete userIds[idx]; - } + for (var idx = 0; idx < userIds.length; idx++) { + if(userIds[idx] !== curUserId) { + teammate = UserStore.getProfile(userIds[idx]); + break; + } + } - return UserStore.getProfile(userIds[0]) + return teammate; } Image.prototype.load = function(url, progressCallback) { |