From 0b52e85ba73e5b3badeb1703462c5d05d3a7d224 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Tue, 10 Nov 2015 10:20:16 -0500
Subject: Added Modal base class that extends ReactBootstrap.Modal

---
 web/react/components/activity_log_modal.jsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'web/react/components/activity_log_modal.jsx')

diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index af423a601..6c329d416 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -63,11 +63,6 @@ export default class ActivityLogModal extends React.Component {
     componentDidMount() {
         UserStore.addSessionsChangeListener(this.onListenerChange);
     }
-    componentDidUpdate(prevProps) {
-        if (this.props.show && !prevProps.show) {
-            this.onShow();
-        }
-    }
     componentWillUnmount() {
         UserStore.removeSessionsChangeListener(this.onListenerChange);
     }
@@ -161,6 +156,7 @@ export default class ActivityLogModal extends React.Component {
         return (
             <Modal
                 show={this.props.show}
+                onShow={this.onShow}
                 onHide={this.onHide}
                 bsSize='large'
             >
-- 
cgit v1.2.3-1-g7c22


From 590e7f903f3b911566465b2fb51ff68c273ded96 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Tue, 10 Nov 2015 11:54:43 -0500
Subject: Renamed onModalDismissed to onHide to keep it consistent with
 React-Bootstrap

---
 web/react/components/activity_log_modal.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'web/react/components/activity_log_modal.jsx')

diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index 6c329d416..5c385c93d 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -4,7 +4,7 @@
 const UserStore = require('../stores/user_store.jsx');
 const Client = require('../utils/client.jsx');
 const AsyncClient = require('../utils/async_client.jsx');
-const Modal = ReactBootstrap.Modal;
+const Modal = require('./modal.jsx');
 const LoadingScreen = require('./loading_screen.jsx');
 const Utils = require('../utils/utils.jsx');
 
@@ -58,7 +58,7 @@ export default class ActivityLogModal extends React.Component {
     }
     onHide() {
         this.setState({moreInfo: []});
-        this.props.onModalDismissed();
+        this.props.onHide();
     }
     componentDidMount() {
         UserStore.addSessionsChangeListener(this.onListenerChange);
@@ -174,5 +174,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
 };
-- 
cgit v1.2.3-1-g7c22


From 70de0125abdc84d70580f82b29a4314e3515a587 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Tue, 17 Nov 2015 16:10:16 -0500
Subject: Removed Modal base class

---
 web/react/components/activity_log_modal.jsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'web/react/components/activity_log_modal.jsx')

diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index 5c385c93d..5824ce7e2 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -4,7 +4,7 @@
 const UserStore = require('../stores/user_store.jsx');
 const Client = require('../utils/client.jsx');
 const AsyncClient = require('../utils/async_client.jsx');
-const Modal = require('./modal.jsx');
+const Modal = ReactBootstrap.Modal;
 const LoadingScreen = require('./loading_screen.jsx');
 const Utils = require('../utils/utils.jsx');
 
@@ -62,6 +62,15 @@ export default class ActivityLogModal extends React.Component {
     }
     componentDidMount() {
         UserStore.addSessionsChangeListener(this.onListenerChange);
+
+        if (this.props.show) {
+            this.onShow();
+        }
+    }
+    componentDidUpdate(prevProps) {
+        if (this.props.show && !prevProps.show) {
+            this.onShow();
+        }
     }
     componentWillUnmount() {
         UserStore.removeSessionsChangeListener(this.onListenerChange);
@@ -156,7 +165,6 @@ export default class ActivityLogModal extends React.Component {
         return (
             <Modal
                 show={this.props.show}
-                onShow={this.onShow}
                 onHide={this.onHide}
                 bsSize='large'
             >
-- 
cgit v1.2.3-1-g7c22