diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
commit | 05d95d80a896d14474c7f7384d67b9edd524b922 (patch) | |
tree | 2fcc619c38175014813ffc7df34abad82e5d5b77 /web/react/components/mention_list.jsx | |
parent | 48ca3a4007c8b9c40a3bc3789563ed9992e9b64d (diff) | |
parent | 4f0c06114b61c92d982baac1c54ed80da93a9cc9 (diff) | |
download | chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.gz chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.bz2 chat-05d95d80a896d14474c7f7384d67b9edd524b922.zip |
Merge branch 'master' into PLT-12
Diffstat (limited to 'web/react/components/mention_list.jsx')
-rw-r--r-- | web/react/components/mention_list.jsx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index afea30161..46a9d76ae 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -216,7 +216,8 @@ export default class MentionList extends React.Component { listId={index} isFocused={isFocused} handleMouseEnter={this.handleMouseEnter.bind(this, index)} - handleClick={this.handleClick} /> + handleClick={this.handleClick} + /> ); index++; } @@ -240,11 +241,13 @@ export default class MentionList extends React.Component { return ( <div className='mentions--top' - style={style}> + style={style} + > <div ref='mentionlist' className='mentions-box' - id='mentionsbox'> + id='mentionsbox' + > {mentions} </div> </div> |