summaryrefslogtreecommitdiffstats
path: root/web/react/components/mention.jsx
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-06-29 15:20:49 -0400
committerJoramWilander <jwawilander@gmail.com>2015-06-29 15:20:49 -0400
commit2d3ef0b0510e4c0be49cb6025e312fcb932789fd (patch)
tree0d639af3121043c69f6178bde3a50cf93c942140 /web/react/components/mention.jsx
parent7b7e73fb9290a8084989a4219681c636670e7555 (diff)
downloadchat-2d3ef0b0510e4c0be49cb6025e312fcb932789fd.tar.gz
chat-2d3ef0b0510e4c0be49cb6025e312fcb932789fd.tar.bz2
chat-2d3ef0b0510e4c0be49cb6025e312fcb932789fd.zip
@all and @channel now auto-complete
Diffstat (limited to 'web/react/components/mention.jsx')
-rw-r--r--web/react/components/mention.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 86a423138..f1292c743 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -9,7 +9,7 @@ module.exports = React.createClass({
return (
<div className="mentions-name" onClick={this.handleClick}>
<img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image"}/>
- <span>@{this.props.username}</span><span className="mention-fullname">{this.props.name}</span>
+ <span>@{this.props.username}</span><span className="mention-fullname">{this.props.secondary_text}</span>
</div>
);
}