diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-07-08 09:01:17 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-07-08 09:01:17 -0400 |
| commit | 450821bcbae2769bf616405401cd3020f7686820 (patch) | |
| tree | b6da092eb19e0ad33e8a2d0a149bef86ebf6225b /web | |
| parent | 85b895ecb7a8a2fd4baf8806723c50e72fe8cce0 (diff) | |
| parent | 809cc9f6f36a4b196885cd78572ff026c06cd0ae (diff) | |
| download | chat-450821bcbae2769bf616405401cd3020f7686820.tar.gz chat-450821bcbae2769bf616405401cd3020f7686820.tar.bz2 chat-450821bcbae2769bf616405401cd3020f7686820.zip | |
Merge pull request #148 from hmhealey/mm1488
MM-1488 Changed code to dismiss mention list to not trigger when you click on the list itself
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/mention_list.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index b666fcfae..3fac41073 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -23,8 +23,9 @@ module.exports = React.createClass({ } } ); - $(document).click(function() { - if($('#'+self.props.id).length && $('#'+self.props.id).get(0) !== $(':focus').get(0)) { + $(document).click(function(e) { + if (!($('#'+self.props.id).is(e.target) || $('#'+self.props.id).has(e.target).length || + ('mentionlist' in self.refs && $(self.refs['mentionlist'].getDOMNode()).has(e.target).length))) { self.setState({mentionText: "-1"}) } }); |