diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-08-14 08:43:49 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-08-14 12:38:16 -0400 |
| commit | b704e9489b21b3bec17f5c8b573a1724781ee6f7 (patch) | |
| tree | 002f9fb35ce932800160bc45d91a50804bbb6594 /web/react/pages/channel.jsx | |
| parent | e27db2ed63fd3c9c686c049a9b9049a907985ecc (diff) | |
| download | chat-b704e9489b21b3bec17f5c8b573a1724781ee6f7.tar.gz chat-b704e9489b21b3bec17f5c8b573a1724781ee6f7.tar.bz2 chat-b704e9489b21b3bec17f5c8b573a1724781ee6f7.zip | |
added google sign-in functionality to the client, with minor model modifications
Diffstat (limited to 'web/react/pages/channel.jsx')
| -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 929499715..52d537f27 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -54,14 +54,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( |