diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-15 10:22:05 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-15 10:22:05 -0800 |
| commit | e017babc5ddd66e65469326bf723d5359875c2d1 (patch) | |
| tree | 0da7ee5d9f4039eeb20f70940483c40943c9aa23 /web/react/components/mention.jsx | |
| parent | 252d0f3924dd19aa4dd1900c6c00c41c84755d1e (diff) | |
| parent | 38f9e140e98123eb256968fb31f7fbb2aef978e0 (diff) | |
| download | chat-e017babc5ddd66e65469326bf723d5359875c2d1.tar.gz chat-e017babc5ddd66e65469326bf723d5359875c2d1.tar.bz2 chat-e017babc5ddd66e65469326bf723d5359875c2d1.zip | |
fixing merge
Diffstat (limited to 'web/react/components/mention.jsx')
| -rw-r--r-- | web/react/components/mention.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx index 3c33ddf49..520b81cbb 100644 --- a/web/react/components/mention.jsx +++ b/web/react/components/mention.jsx @@ -1,5 +1,6 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. +var UserStore = require("../stores/user_store.jsx"); module.exports = React.createClass({ handleClick: function() { @@ -7,8 +8,9 @@ module.exports = React.createClass({ }, render: function() { var icon; + var timestamp = UserStore.getCurrentUser().update_at; if (this.props.id != null) { - icon = <span><img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image"}/></span>; + icon = <span><img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image?time=" + timestamp}/></span>; } else { icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>; } |