diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-01 17:40:54 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-01 17:40:54 -0400 |
commit | 581bd8637fa860fa26f60d8089c5d6e3f613d23f (patch) | |
tree | b0ba799af7f873b460e45f5e6057b357be0e8047 /webapp/utils/utils.jsx | |
parent | 935405f19d4a0d78f1a84964460635ec5a091e0c (diff) | |
download | chat-581bd8637fa860fa26f60d8089c5d6e3f613d23f.tar.gz chat-581bd8637fa860fa26f60d8089c5d6e3f613d23f.tar.bz2 chat-581bd8637fa860fa26f60d8089c5d6e3f613d23f.zip |
Revert "[GH-5915] Clicking on @mention of a user in a post shows the profile popover (#6129)" (#6289)
This reverts commit 83f819451a80a767170b927eb2f0d5ed63f03239.
Diffstat (limited to 'webapp/utils/utils.jsx')
-rw-r--r-- | webapp/utils/utils.jsx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 9b29c5362..f56b9bb09 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -989,16 +989,12 @@ export function changeOpacity(oldColor, opacity) { } export function getFullName(user) { - if (user !== null && typeof user !== 'undefined' && typeof user === 'object') { - const firstName = user.hasOwnProperty('first_name') ? user.first_name : ''; - const lastName = user.hasOwnProperty('last_name') ? user.last_name : ''; - if (firstName && lastName) { - return firstName + ' ' + lastName; - } else if (firstName) { - return firstName; - } else if (lastName) { - return lastName; - } + if (user.first_name && user.last_name) { + return user.first_name + ' ' + user.last_name; + } else if (user.first_name) { + return user.first_name; + } else if (user.last_name) { + return user.last_name; } return ''; |