diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-19 10:25:51 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-19 10:25:51 -0700 |
| commit | 468f01dc895000211e62eb8a16feaa84ceb354ed (patch) | |
| tree | 4868b46316bb79cf5c127f5b0638f3383a7c971c /web/react/components/admin_console/admin_sidebar.jsx | |
| parent | a8f3f76c592928a0907fbaddd71ab6b8f68d28d6 (diff) | |
| parent | ea1b3129688dd76c80c7d41eec4f2eb60f9f0639 (diff) | |
| download | chat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.gz chat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.bz2 chat-468f01dc895000211e62eb8a16feaa84ceb354ed.zip | |
Merging from master
Diffstat (limited to 'web/react/components/admin_console/admin_sidebar.jsx')
| -rw-r--r-- | web/react/components/admin_console/admin_sidebar.jsx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx index 4c2a473b6..b0e01ff17 100644 --- a/web/react/components/admin_console/admin_sidebar.jsx +++ b/web/react/components/admin_console/admin_sidebar.jsx @@ -24,6 +24,7 @@ export default class AdminSidebar extends React.Component { handleClick(name, teamId, e) { e.preventDefault(); this.props.selectTab(name, teamId); + history.pushState({name: name, teamId: teamId}, null, `/admin_console/${name}/${teamId || ''}`); } isSelected(name, teamId) { @@ -53,6 +54,9 @@ export default class AdminSidebar extends React.Component { } componentDidMount() { + if ($(window).width() > 768) { + $('.nav-pills__container').perfectScrollbar(); + } } showTeamSelect(e) { |