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 | |
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')
-rw-r--r-- | web/react/components/member_list_team.jsx | 8 | ||||
-rw-r--r-- | web/react/components/more_channels.jsx | 2 | ||||
-rw-r--r-- | web/react/stores/channel_store.jsx | 9 | ||||
-rw-r--r-- | web/react/utils/async_client.jsx | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx index 3613d97d8..cfb473e5e 100644 --- a/web/react/components/member_list_team.jsx +++ b/web/react/components/member_list_team.jsx @@ -92,10 +92,10 @@ var MemberListTeamItem = React.createClass({ <span className="caret"></span> </a> <ul className="dropdown-menu member-menu" role="menu" aria-labelledby="channel_header_dropdown"> - { showMakeAdmin ? <li role="presentation"><a role="menuitem" onClick={this.handleMakeAdmin}>Make Admin</a></li> : "" } - { showMakeMember ? <li role="presentation"><a role="menuitem" onClick={this.handleMakeMember}>Make Member</a></li> : "" } - { showMakeActive ? <li role="presentation"><a role="menuitem" onClick={this.handleMakeActive}>Make Active</a></li> : "" } - { showMakeNotActive ? <li role="presentation"><a role="menuitem" onClick={this.handleMakeNotActive}>Make Inactive</a></li> : "" } + { showMakeAdmin ? <li role="presentation"><a role="menuitem" href="#" onClick={this.handleMakeAdmin}>Make Admin</a></li> : "" } + { showMakeMember ? <li role="presentation"><a role="menuitem" href="#" onClick={this.handleMakeMember}>Make Member</a></li> : "" } + { showMakeActive ? <li role="presentation"><a role="menuitem" href="#" onClick={this.handleMakeActive}>Make Active</a></li> : "" } + { showMakeNotActive ? <li role="presentation"><a role="menuitem" href="#" onClick={this.handleMakeNotActive}>Make Inactive</a></li> : "" } </ul> </div> { server_error } 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> diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx index 340ce9922..4429a5312 100644 --- a/web/react/stores/channel_store.jsx +++ b/web/react/stores/channel_store.jsx @@ -202,16 +202,17 @@ var ChannelStore = assign({}, EventEmitter.prototype, { BrowserStore.setItem("more_channels", JSON.stringify(channels)); }, _getMoreChannels: function() { - var channels; + var channels = null; try { channels = JSON.parse(BrowserStore.getItem("more_channels")); } catch (err) { } - if (channels == null) { - channels = []; - } + if (channels == null) { + channels = {}; + channels.loading = true; + } return channels; }, diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx index 87dc91200..3ae7e1e5c 100644 --- a/web/react/utils/async_client.jsx +++ b/web/react/utils/async_client.jsx @@ -104,7 +104,7 @@ module.exports.updateLastViewedAt = function() { module.exports.getMoreChannels = function(force) { if (isCallInProgress("getMoreChannels")) return; - if (!ChannelStore.getMoreAll() || force) { + if (ChannelStore.getMoreAll().loading || force) { callTracker["getMoreChannels"] = utils.getTimestamp(); client.getMoreChannels( |