IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-3842 - Fixing scrolling issue on account/team settings modal (#3819)

Browse Source
This commit is contained in:
Asaad Mahmood
2016-08-18 19:09:33 +05:00
committed by enahum
parent efb060a336
commit e5a3e55737
6 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/channel_notifications_modal.jsx
View File

@@ -34,7 +34,9 @@ export default class ChannelNotificationsModal extends React.Component {
};
}
updateSection(section) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
if ($('.section-max').length) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
}
this.setState({activeSection: section});
}
componentWillReceiveProps(nextProps) {

4
webapp/components/team_general_tab.jsx
View File

@@ -81,7 +81,9 @@ class GeneralTab extends React.Component {
}
updateSection(section) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
if ($('.section-max').length) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
}
this.setState(this.setupInitialState(this.props));
this.props.updateSection(section);
}

4
webapp/components/team_settings_modal.jsx
View File

@@ -58,7 +58,9 @@ class TeamSettingsModal extends React.Component {
}
}
updateSection(section) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
if ($('.section-max').length) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
}
this.setState({activeSection: section});
}
render() {

4
webapp/components/user_settings/user_settings_advanced.jsx
View File

@@ -126,7 +126,9 @@ export default class AdvancedSettingsDisplay extends React.Component {
}
updateSection(section) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
if ($('.section-max').length) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
}
if (!section) {
this.setState(this.getStateFromStores());
}

4
webapp/components/user_settings/user_settings_display.jsx
View File

@@ -126,7 +126,9 @@ export default class UserSettingsDisplay extends React.Component {
}
updateSection(section) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
if ($('.section-max').length) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
}
this.updateState();
this.props.updateSection(section);
}

4
webapp/components/user_settings/user_settings_general.jsx
View File

@@ -285,7 +285,9 @@ class UserSettingsGeneralTab extends React.Component {
}
updateSection(section) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
if ($('.section-max').length) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
}
const emailChangeInProgress = this.state.emailChangeInProgress;
this.setState(Object.assign({}, this.setupInitialState(this.props), {emailChangeInProgress, clientError: '', serverError: '', emailError: ''}));
this.submitActive = false;