diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-03-23 16:02:36 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-23 16:02:36 -0400 |
commit | 6ccef5caf5ff33b765bd488d4f609c4426c7bbf0 (patch) | |
tree | a3dc95120cd5113917bb4ec5acab716d645d4d3a /webapp/components/team_settings_modal.jsx | |
parent | 7af2e6f87a754312809aa044edd062930616401a (diff) | |
parent | e60f6f3b137839ed603a1b5d45cf658b6570ff91 (diff) | |
download | chat-6ccef5caf5ff33b765bd488d4f609c4426c7bbf0.tar.gz chat-6ccef5caf5ff33b765bd488d4f609c4426c7bbf0.tar.bz2 chat-6ccef5caf5ff33b765bd488d4f609c4426c7bbf0.zip |
Merge pull request #2509 from asaadmahmoodspin/ui-improvements
Multiple UI improvements
Diffstat (limited to 'webapp/components/team_settings_modal.jsx')
-rw-r--r-- | webapp/components/team_settings_modal.jsx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/webapp/components/team_settings_modal.jsx b/webapp/components/team_settings_modal.jsx index 7dbbd680a..c19787993 100644 --- a/webapp/components/team_settings_modal.jsx +++ b/webapp/components/team_settings_modal.jsx @@ -5,6 +5,7 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; import SettingsSidebar from './settings_sidebar.jsx'; import TeamSettings from './team_settings.jsx'; +import * as Utils from 'utils/utils.jsx'; import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'react-intl'; @@ -49,9 +50,16 @@ class TeamSettingsModal extends React.Component { $('.modal-dialog.display--content').removeClass('display--content'); }, 500); }); + + if (!Utils.isMobile()) { + $('.settings-modal .settings-content').perfectScrollbar(); + } } updateTab(tab) { this.setState({activeTab: tab, activeSection: ''}); + if (!Utils.isMobile()) { + $('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update'); + } } updateSection(section) { this.setState({activeSection: section}); |