1 files changed, 24 insertions, 16 deletions

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 98014ed12..182721bef 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -5,7 +5,7 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var Navbar = require('../components/navbar.jsx');
 var Sidebar = require('../components/sidebar.jsx');
 var ChannelHeader = require('../components/channel_header.jsx');
-var PostList = require('../components/post_list.jsx');
+var PostListContainer = require('../components/post_list_container.jsx');
 var CreatePost = require('../components/create_post.jsx');
 var SidebarRight = require('../components/sidebar_right.jsx');
 var SidebarRightMenu = require('../components/sidebar_right_menu.jsx');
@@ -26,13 +26,13 @@ var ChannelMembersModal = require('../components/channel_members.jsx');
 var ChannelInviteModal = require('../components/channel_invite_modal.jsx');
 var TeamMembersModal = require('../components/team_members.jsx');
 var DirectChannelModal = require('../components/more_direct_channels.jsx');
-var ErrorBar = require('../components/error_bar.jsx')
+var ErrorBar = require('../components/error_bar.jsx');
 var ChannelLoader = require('../components/channel_loader.jsx');
 var MentionList = require('../components/mention_list.jsx');
 var ChannelInfoModal = require('../components/channel_info_modal.jsx');
 var AccessHistoryModal = require('../components/access_history_modal.jsx');
 var ActivityLogModal = require('../components/activity_log_modal.jsx');
-var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx')
+var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx');
 var FileUploadOverlay = require('../components/file_upload_overlay.jsx');
 
 var AsyncClient = require('../utils/async_client.jsx');
@@ -40,18 +40,18 @@ var AsyncClient = require('../utils/async_client.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
-global.window.setup_channel_page = function(team_name, team_type, team_id, channel_name, channel_id) {
+function setupChannelPage(teamName, teamType, teamId, channelName, channelId) {
     AsyncClient.getConfig();
 
     AppDispatcher.handleViewAction({
         type: ActionTypes.CLICK_CHANNEL,
-        name: channel_name,
-        id: channel_id
+        name: channelName,
+        id: channelId
     });
 
     AppDispatcher.handleViewAction({
         type: ActionTypes.CLICK_TEAM,
-        id: team_id
+        id: teamId
     });
 
     // ChannelLoader must be rendered first
@@ -66,12 +66,15 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
     );
 
     React.render(
-        <Navbar teamDisplayName={team_name} />,
+        <Navbar teamDisplayName={teamName} />,
         document.getElementById('navbar')
     );
 
     React.render(
-        <Sidebar teamDisplayName={team_name} teamType={team_type} />,
+        <Sidebar
+            teamDisplayName={teamName}
+            teamType={teamType}
+        />,
         document.getElementById('sidebar-left')
     );
 
@@ -86,17 +89,17 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
     );
 
     React.render(
-        <TeamSettingsModal teamDisplayName={team_name} />,
+        <TeamSettingsModal teamDisplayName={teamName} />,
         document.getElementById('team_settings_modal')
     );
 
     React.render(
-        <TeamMembersModal teamDisplayName={team_name} />,
+        <TeamMembersModal teamDisplayName={teamName} />,
         document.getElementById('team_members_modal')
     );
 
     React.render(
-        <MemberInviteModal teamType={team_type} />,
+        <MemberInviteModal teamType={teamType} />,
         document.getElementById('invite_member_modal')
     );
 
@@ -156,7 +159,7 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
     );
 
     React.render(
-        <PostList />,
+        <PostListContainer />,
         document.getElementById('post-list')
     );
 
@@ -186,7 +189,10 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
     );
 
     React.render(
-        <SidebarRightMenu teamDisplayName={team_name} teamType={team_type} />,
+        <SidebarRightMenu
+            teamDisplayName={teamName}
+            teamType={teamType}
+        />,
         document.getElementById('sidebar-menu')
     );
 
@@ -222,8 +228,10 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
 
     React.render(
         <FileUploadOverlay
-            overlayType='center' />,
+            overlayType='center'
+        />,
         document.getElementById('file_upload_overlay')
     );
+}
 
-};
+global.window.setup_channel_page = setupChannelPage;