diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-25 08:11:01 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-25 08:11:01 -0700 |
| commit | d989be85cb52b66d092db9b5647f8fcc2df17a8f (patch) | |
| tree | d9effd2354a61a787987d784944e4d6bb7d5582d /web/react/components | |
| parent | 8a9fc46f8b62a61d07e943f708749f046a596571 (diff) | |
| parent | 2322a7c74ed8e5d411e08e59b45c54f4663a1683 (diff) | |
| download | chat-d989be85cb52b66d092db9b5647f8fcc2df17a8f.tar.gz chat-d989be85cb52b66d092db9b5647f8fcc2df17a8f.tar.bz2 chat-d989be85cb52b66d092db9b5647f8fcc2df17a8f.zip | |
Merge branch 'master' into PLT-157
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/user_settings/user_settings_appearance.jsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx index 7617f04d1..4372069e7 100644 --- a/web/react/components/user_settings/user_settings_appearance.jsx +++ b/web/react/components/user_settings/user_settings_appearance.jsx @@ -81,6 +81,8 @@ export default class UserSettingsAppearance extends React.Component { $('#user_settings').off('hidden.bs.modal', this.handleClose); this.props.updateTab('general'); + $('.ps-container.modal-body').scrollTop(0); + $('.ps-container.modal-body').perfectScrollbar('update'); $('#user_settings').modal('hide'); }, (err) => { |