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/team_members.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/team_members.jsx')
| -rw-r--r-- | web/react/components/team_members.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/team_members.jsx b/web/react/components/team_members.jsx index 0f60d93b2..33590c89a 100644 --- a/web/react/components/team_members.jsx +++ b/web/react/components/team_members.jsx @@ -44,11 +44,11 @@ export default class TeamMembers extends React.Component { UserStore.addChangeListener(this.onChange); var self = this; - $(React.findDOMNode(this.refs.modal)).on('hidden.bs.modal', function show() { + $(ReactDOM.findDOMNode(this.refs.modal)).on('hidden.bs.modal', function show() { self.setState({render_members: false}); }); - $(React.findDOMNode(this.refs.modal)).on('show.bs.modal', function hide() { + $(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', function hide() { self.setState({render_members: true}); }); } |