diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
commit | 05d95d80a896d14474c7f7384d67b9edd524b922 (patch) | |
tree | 2fcc619c38175014813ffc7df34abad82e5d5b77 /web/react/pages/channel.jsx | |
parent | 48ca3a4007c8b9c40a3bc3789563ed9992e9b64d (diff) | |
parent | 4f0c06114b61c92d982baac1c54ed80da93a9cc9 (diff) | |
download | chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.gz chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.bz2 chat-05d95d80a896d14474c7f7384d67b9edd524b922.zip |
Merge branch 'master' into PLT-12
Diffstat (limited to 'web/react/pages/channel.jsx')
-rw-r--r-- | web/react/pages/channel.jsx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index d56b309fa..71a03cde0 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -73,7 +73,8 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) { React.render( <Sidebar teamDisplayName={teamName} - teamType={teamType} />, + teamType={teamType} + />, document.getElementById('sidebar-left') ); @@ -190,7 +191,8 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) { React.render( <SidebarRightMenu teamDisplayName={teamName} - teamType={teamType} />, + teamType={teamType} + />, document.getElementById('sidebar-menu') ); @@ -226,7 +228,8 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) { React.render( <FileUploadOverlay - overlayType='center' />, + overlayType='center' + />, document.getElementById('file_upload_overlay') ); } |