diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-18 08:47:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-18 08:47:35 -0400 |
| commit | 2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218 (patch) | |
| tree | 1de5578c9050a33635960fc046fdf97339254be0 /web/react/pages | |
| parent | 96d1eb1c800a427e31e63970e57d0824a3bc91e3 (diff) | |
| parent | a7f09be9783f3354ab38d4fb4fb82085241d018f (diff) | |
| download | chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.tar.gz chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.tar.bz2 chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.zip | |
Merge pull request #381 from mattermost/mm-1705
MM-1705 add google as an oauth single-sign-on service
Diffstat (limited to 'web/react/pages')
| -rw-r--r-- | web/react/pages/channel.jsx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index 6e4baa582..0eeb5fb65 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -55,14 +55,15 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann id: team_id }); + // ChannelLoader must be rendered first React.render( - <ErrorBar/>, - document.getElementById('error_bar') + <ChannelLoader/>, + document.getElementById('channel_loader') ); React.render( - <ChannelLoader/>, - document.getElementById('channel_loader') + <ErrorBar/>, + document.getElementById('error_bar') ); React.render( |