diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-04 08:33:50 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-04 08:33:50 -0600 |
commit | 4a802384871ab80c433c2ae5f18da67fd9884675 (patch) | |
tree | bafd613c8ace5606a38075590bc8c589eceb78af /web/react/components | |
parent | d4c4037f84c4bc3789a7ef91fe37d64e11bc0628 (diff) | |
parent | 13f9a55cfd8cd32272f09998ee7a64537bfc0af8 (diff) | |
download | chat-4a802384871ab80c433c2ae5f18da67fd9884675.tar.gz chat-4a802384871ab80c433c2ae5f18da67fd9884675.tar.bz2 chat-4a802384871ab80c433c2ae5f18da67fd9884675.zip |
Merge pull request #1784 from mattermost/plt-1591
PLT-1591 Fix appearance settings scroll bug
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/user_settings/user_settings_appearance.jsx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx index ad41ab771..7bfc9fdbd 100644 --- a/web/react/components/user_settings/user_settings_appearance.jsx +++ b/web/react/components/user_settings/user_settings_appearance.jsx @@ -74,6 +74,10 @@ export default class UserSettingsAppearance extends React.Component { this.props.setEnforceFocus(true); } + scrollToTop() { + $('.ps-container.modal-body').scrollTop(0); + $('.ps-container.modal-body').perfectScrollbar('update'); + } submitTheme(e) { e.preventDefault(); var user = UserStore.getCurrentUser(); @@ -88,9 +92,7 @@ export default class UserSettingsAppearance extends React.Component { this.props.setRequireConfirm(false); this.originalTheme = Object.assign({}, this.state.theme); - - $('.ps-container.modal-body').scrollTop(0); - $('.ps-container.modal-body').perfectScrollbar('update'); + this.scrollToTop(); }, (err) => { var state = this.getStateFromStores(); @@ -129,6 +131,7 @@ export default class UserSettingsAppearance extends React.Component { const state = this.getStateFromStores(); state.serverError = null; this.setState(state); + this.scrollToTop(); Utils.applyTheme(state.theme); |