diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-08 23:08:06 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-08 23:08:06 +0500 |
| commit | de742baac09726fe2ef9f7274d260950a6828589 (patch) | |
| tree | 509abbd84a49b3311a8d808a7d4573c493d1270f /web/react | |
| parent | 235beeb82926abd79f032cecb5f7ddbb4ff72f8b (diff) | |
| download | chat-de742baac09726fe2ef9f7274d260950a6828589.tar.gz chat-de742baac09726fe2ef9f7274d260950a6828589.tar.bz2 chat-de742baac09726fe2ef9f7274d260950a6828589.zip | |
MM-1469 - Loading message in more channel modal
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/more_channels.jsx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx index dad0a644a..1af259853 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 ? (moreChannels.length ? <table className="more-channel-table table"> <tbody> @@ -100,14 +100,15 @@ module.exports = React.createClass({ <p className="primary-message">No more channels to join</p> <p className="secondary-message">Click 'Create New Channel' to make a new one</p> </div>) - : <div ref="loadingscreen" className="channel-loading-message"> + : <div ref="loadingscreen" className="loading-screen loading-screen--channel"> <div className="loading__content"> <h3>Loading</h3> <div id="round_1" className="round"></div> <div id="round_2" className="round"></div> <div id="round_3" className="round"></div> </div> - </div>} + </div> + } { server_error } </div> <div className="modal-footer"> |