diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-18 08:49:29 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-18 08:49:29 -0500 |
commit | 7b01528d17c61a762ded17a23ccd9a2a728910a0 (patch) | |
tree | 9dd7fd2667ae03c4e72bb4abd495d2c3d84373ea /web/react/components/activity_log_modal.jsx | |
parent | 5716a5e2fd96859e7d0c8784bd0297b4654dcf4b (diff) | |
parent | 70de0125abdc84d70580f82b29a4314e3515a587 (diff) | |
download | chat-7b01528d17c61a762ded17a23ccd9a2a728910a0.tar.gz chat-7b01528d17c61a762ded17a23ccd9a2a728910a0.tar.bz2 chat-7b01528d17c61a762ded17a23ccd9a2a728910a0.zip |
Merge pull request #1423 from hmhealey/plt737
PLT-737 Converted first set of Modals to ReactBootstrap
Diffstat (limited to 'web/react/components/activity_log_modal.jsx')
-rw-r--r-- | web/react/components/activity_log_modal.jsx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index af423a601..5824ce7e2 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -58,10 +58,14 @@ export default class ActivityLogModal extends React.Component { } onHide() { this.setState({moreInfo: []}); - this.props.onModalDismissed(); + this.props.onHide(); } componentDidMount() { UserStore.addSessionsChangeListener(this.onListenerChange); + + if (this.props.show) { + this.onShow(); + } } componentDidUpdate(prevProps) { if (this.props.show && !prevProps.show) { @@ -178,5 +182,5 @@ export default class ActivityLogModal extends React.Component { ActivityLogModal.propTypes = { show: React.PropTypes.bool.isRequired, - onModalDismissed: React.PropTypes.func.isRequired + onHide: React.PropTypes.func.isRequired }; |