diff options
author | Corey Hulen <corey@hulen.com> | 2016-03-22 08:08:46 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-03-22 08:08:46 -0700 |
commit | 6568e15023c009c96a46f022236f5fd4415445c0 (patch) | |
tree | f17fd6d8fce9feb44adc17a4880a4f7dc5cb6897 /webapp/components/more_direct_channels.jsx | |
parent | bb212949f9f90ea3f4f7c07c7e3ca624c2843a90 (diff) | |
parent | 4e3eb2bb181ff6baad9911e231558eee0a08291c (diff) | |
download | chat-6568e15023c009c96a46f022236f5fd4415445c0.tar.gz chat-6568e15023c009c96a46f022236f5fd4415445c0.tar.bz2 chat-6568e15023c009c96a46f022236f5fd4415445c0.zip |
Merge pull request #2498 from hmhealey/plt2285
PLT-2285 Adding spinner after clicking invite channel member button
Diffstat (limited to 'webapp/components/more_direct_channels.jsx')
-rw-r--r-- | webapp/components/more_direct_channels.jsx | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx index 57cac7229..d1446059d 100644 --- a/webapp/components/more_direct_channels.jsx +++ b/webapp/components/more_direct_channels.jsx @@ -5,9 +5,9 @@ import {Modal} from 'react-bootstrap'; import FilteredUserList from './filtered_user_list.jsx'; import UserStore from 'stores/user_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import loadingGif from 'images/load.gif'; import {FormattedMessage} from 'react-intl'; +import SpinnerButton from 'components/spinner_button.jsx'; import React from 'react'; @@ -83,26 +83,16 @@ export default class MoreDirectChannels extends React.Component { } createJoinDirectChannelButton({user}) { - if (this.state.loadingDMChannel === user.id) { - return ( - <img - className='channel-loading-gif' - src={loadingGif} - /> - ); - } - return ( - <button - type='button' - className='btn btn-primary btn-message' + <SpinnerButton + spinning={this.state.loadingDMChannel === user.id} onClick={this.handleShowDirectChannel.bind(this, user)} > <FormattedMessage id='more_direct_channels.message' defaultMessage='Message' /> - </button> + </SpinnerButton> ); } |