diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-07-29 12:55:57 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-07-29 12:55:57 -0400 |
commit | d5c5ae0939bcff58110b88559b2122394b656735 (patch) | |
tree | d82eeaf84b3706b8678a63445b0e927e4cdaad58 /web/react/components/activity_log_modal.jsx | |
parent | 99138954232ed2d471d8bedd7377db5a7e74fc4a (diff) | |
parent | 8c14a16d0126a32c0f45f9d9a172cc06f867cc23 (diff) | |
download | chat-d5c5ae0939bcff58110b88559b2122394b656735.tar.gz chat-d5c5ae0939bcff58110b88559b2122394b656735.tar.bz2 chat-d5c5ae0939bcff58110b88559b2122394b656735.zip |
Merge pull request #269 from rgarmsen2295/mm-1686
MM-1686 Access History and Active Sessions now load upon opening instead of at start
Diffstat (limited to 'web/react/components/activity_log_modal.jsx')
-rw-r--r-- | web/react/components/activity_log_modal.jsx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index 90f139e8b..f28f0d5f1 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -4,6 +4,8 @@ var UserStore = require('../stores/user_store.jsx'); var Client = require('../utils/client.jsx'); var AsyncClient = require('../utils/async_client.jsx'); +var LoadingScreen = require('./loading_screen.jsx'); +var utils = require('../utils/utils.jsx'); function getStateFromStoresForSessions() { return { @@ -29,7 +31,9 @@ module.exports = React.createClass({ }, componentDidMount: function() { UserStore.addSessionsChangeListener(this._onChange); - AsyncClient.getSessions(); + $(this.refs.modal.getDOMNode()).on('shown.bs.modal', function (e) { + AsyncClient.getSessions(); + }); var self = this; $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) { @@ -40,7 +44,10 @@ module.exports = React.createClass({ UserStore.removeSessionsChangeListener(this._onChange); }, _onChange: function() { - this.setState(getStateFromStoresForSessions()); + var newState = getStateFromStoresForSessions(); + if (!utils.areStatesEqual(newState.sessions, this.state.sessions)) { + this.setState(newState); + } }, handleMoreInfo: function(index) { var newMoreInfo = this.state.moreInfo; @@ -106,10 +113,16 @@ module.exports = React.createClass({ </div> <p className="session-help-text">Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the "Logout" button below to end a session.</p> <div ref="modalBody" className="modal-body"> + { !this.state.sessions.loading ? + <div> <form role="form"> { activityList } </form> { server_error } + </div> + : + <LoadingScreen /> + } </div> </div> </div> |