summaryrefslogtreecommitdiffstats
path: root/web/react/components/activity_log_modal.jsx
diff options
context:
space:
mode:
authornickago <ngonella@calpoly.edu>2015-08-07 09:41:14 -0700
committernickago <ngonella@calpoly.edu>2015-08-11 13:33:08 -0700
commite01cae5c0965371efa8179abf10434d12dfd5843 (patch)
tree979c82f92058aac5dd06da1ec28e9ebb753ee265 /web/react/components/activity_log_modal.jsx
parent4c7cdb20f074e2c06a08cd64a57060b8e8b64d2e (diff)
downloadchat-e01cae5c0965371efa8179abf10434d12dfd5843.tar.gz
chat-e01cae5c0965371efa8179abf10434d12dfd5843.tar.bz2
chat-e01cae5c0965371efa8179abf10434d12dfd5843.zip
access history and activity log closing re-opens user settings in correct state
Diffstat (limited to 'web/react/components/activity_log_modal.jsx')
-rw-r--r--web/react/components/activity_log_modal.jsx1
1 files changed, 1 insertions, 0 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index f28f0d5f1..64f93ca71 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -37,6 +37,7 @@ module.exports = React.createClass({
var self = this;
$(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) {
+ $('#user_settings1').modal('show');
self.setState({ moreInfo: [] });
});
},