diff options
author | Corey Hulen <corey@hulen.com> | 2015-07-10 11:24:31 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-07-10 11:24:31 -0800 |
commit | d124b9df109e55448aa2d3556a56d65e1c1982fd (patch) | |
tree | f47c24236a53c98f4b485d1ecd023f4375e04ab5 /web/react/components/more_channels.jsx | |
parent | 947da5d2878007a693460c7d3df29f19969683e5 (diff) | |
parent | 6f043c5b740c9bbc6e17b4ef79da1ed29fb96668 (diff) | |
download | chat-d124b9df109e55448aa2d3556a56d65e1c1982fd.tar.gz chat-d124b9df109e55448aa2d3556a56d65e1c1982fd.tar.bz2 chat-d124b9df109e55448aa2d3556a56d65e1c1982fd.zip |
Merge pull request #157 from rgarmsen2295/mm-1265
MM-1265 Button to change roles now shows "click" mouse ptr when hovered over & change with loading more channels
Diffstat (limited to 'web/react/components/more_channels.jsx')
-rw-r--r-- | web/react/components/more_channels.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx index 1af259853..c3ddc76f3 100644 --- a/web/react/components/more_channels.jsx +++ b/web/react/components/more_channels.jsx @@ -79,7 +79,7 @@ module.exports = React.createClass({ <button data-toggle="modal" data-target="#new_channel" data-channeltype={this.state.channel_type} type="button" className="btn btn-primary channel-create-btn" onClick={this.handleNewChannel}>Create New Channel</button> </div> <div className="modal-body"> - {moreChannels ? + {!moreChannels.loading ? (moreChannels.length ? <table className="more-channel-table table"> <tbody> |