diff options
author | =Corey Hulen <corey@hulen.com> | 2015-07-30 01:06:50 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-07-30 01:06:50 -0800 |
commit | d93bf60248f066542d0851a7b6847f925975d77f (patch) | |
tree | bb2c8a931855c3a9da6cdd7d906a8f1b99b7fd46 /web/react/components/access_history_modal.jsx | |
parent | b4877c5d36569dae486a1e53f39c35d346e3d3d2 (diff) | |
parent | deb4fac1f64fde5d5f435129a79eada44cb6994c (diff) | |
download | chat-d93bf60248f066542d0851a7b6847f925975d77f.tar.gz chat-d93bf60248f066542d0851a7b6847f925975d77f.tar.bz2 chat-d93bf60248f066542d0851a7b6847f925975d77f.zip |
Merge branch 'master' into mm-1355
Diffstat (limited to 'web/react/components/access_history_modal.jsx')
-rw-r--r-- | web/react/components/access_history_modal.jsx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/web/react/components/access_history_modal.jsx b/web/react/components/access_history_modal.jsx index 462f046f6..6cc8ec8a9 100644 --- a/web/react/components/access_history_modal.jsx +++ b/web/react/components/access_history_modal.jsx @@ -3,7 +3,8 @@ var UserStore = require('../stores/user_store.jsx'); var AsyncClient = require('../utils/async_client.jsx'); -var Utils = require('../utils/utils.jsx'); +var LoadingScreen = require('./loading_screen.jsx'); +var utils = require('../utils/utils.jsx'); function getStateFromStoresForAudits() { return { @@ -14,7 +15,9 @@ function getStateFromStoresForAudits() { module.exports = React.createClass({ componentDidMount: function() { UserStore.addAuditsChangeListener(this._onChange); - AsyncClient.getAudits(); + $(this.refs.modal.getDOMNode()).on('shown.bs.modal', function (e) { + AsyncClient.getAudits(); + }); var self = this; $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) { @@ -25,7 +28,10 @@ module.exports = React.createClass({ UserStore.removeAuditsChangeListener(this._onChange); }, _onChange: function() { - this.setState(getStateFromStoresForAudits()); + var newState = getStateFromStoresForAudits(); + if (!utils.areStatesEqual(newState.audits, this.state.audits)) { + this.setState(newState); + } }, handleMoreInfo: function(index) { var newMoreInfo = this.state.moreInfo; @@ -87,9 +93,13 @@ module.exports = React.createClass({ <h4 className="modal-title" id="myModalLabel">Access History</h4> </div> <div ref="modalBody" className="modal-body"> + { !this.state.audits.loading ? <form role="form"> { accessList } </form> + : + <LoadingScreen /> + } </div> </div> </div> |