summaryrefslogtreecommitdiffstats
path: root/web/react/components/settings_sidebar.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-08-19 12:19:02 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-08-19 12:19:02 -0400
commit5f439458059c94054c2e41b7bf21234008830709 (patch)
tree00a46bcf2112cf38f70deeb1acae6c6424f472cc /web/react/components/settings_sidebar.jsx
parentca6bff340d2319ee86828de3591f010a66ffa8f9 (diff)
parent9222e191aab9397b6a7c6713d1b0b0b96b421de7 (diff)
downloadchat-5f439458059c94054c2e41b7bf21234008830709.tar.gz
chat-5f439458059c94054c2e41b7bf21234008830709.tar.bz2
chat-5f439458059c94054c2e41b7bf21234008830709.zip
Merge pull request #394 from mattermost/mm-1410
MM-1410 Initial implementaiton of import from Slack
Diffstat (limited to 'web/react/components/settings_sidebar.jsx')
-rw-r--r--web/react/components/settings_sidebar.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/settings_sidebar.jsx b/web/react/components/settings_sidebar.jsx
index b4d291622..d8091ec28 100644
--- a/web/react/components/settings_sidebar.jsx
+++ b/web/react/components/settings_sidebar.jsx
@@ -15,7 +15,7 @@ module.exports = React.createClass({
<div className="">
<ul className="nav nav-pills nav-stacked">
{this.props.tabs.map(function(tab) {
- return <li key={tab.name+'_li'} className={self.props.activeTab == tab.name ? 'active' : ''}><a key={tab.name + '_a'} href="#" onClick={function(){self.updateTab(tab.name);}}><i key={tab.name+'_i'} className={tab.icon}></i>{tab.ui_name}</a></li>
+ return <li key={tab.name+'_li'} className={self.props.activeTab == tab.name ? 'active' : ''}><a key={tab.name + '_a'} href="#" onClick={function(){self.updateTab(tab.name);}}><i key={tab.name+'_i'} className={tab.icon}></i>{tab.uiName}</a></li>
})}
</ul>
</div>