diff options
| author | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
|---|---|---|
| committer | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
| commit | 79fcb9808421dd93342a9538d05dd2259f5dd14b (patch) | |
| tree | 33a1a865144f280e37fde07a7c91ed8825c53801 /web/react/components/mention_list.jsx | |
| parent | 2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff) | |
| parent | 50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff) | |
| download | chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2 chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip | |
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
web/react/utils/constants.jsx
Diffstat (limited to 'web/react/components/mention_list.jsx')
| -rw-r--r-- | web/react/components/mention_list.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index b9ba5f58c..8c1da942d 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -61,7 +61,7 @@ export default class MentionList extends React.Component { } onClick(e) { if (!($('#' + this.props.id).is(e.target) || $('#' + this.props.id).has(e.target).length || - ('mentionlist' in this.refs && $(React.findDOMNode(this.refs.mentionlist)).has(e.target).length))) { + ('mentionlist' in this.refs && $(ReactDOM.findDOMNode(this.refs.mentionlist)).has(e.target).length))) { this.setState({mentionText: '-1'}); } } |