Этот коммит содержится в:
David Lu
2016-07-06 17:16:53 -04:00
коммит произвёл Corey Hulen
родитель 3ebc259f63
Коммит 7b6e8d788b
6 изменённых файлов: 37 добавлений и 10 удалений

Просмотреть файл

@@ -84,7 +84,7 @@ class ImportThemeModal extends React.Component {
const user = UserStore.getCurrentUser();
user.theme_props = theme;
Client.updateUser(user,
Client.updateUser(user, Constants.UserUpdateEvents.THEME,
(data) => {
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_ME,

Просмотреть файл

@@ -6,6 +6,7 @@ import SettingItemMax from '../setting_item_max.jsx';
import Client from 'utils/web_client.jsx';
import * as I18n from 'i18n/i18n.jsx';
import * as GlobalActions from 'actions/global_actions.jsx';
import Constants from 'utils/constants.jsx';
import {FormattedMessage} from 'react-intl';
@@ -41,7 +42,7 @@ export default class ManageLanguage extends React.Component {
this.submitUser(user);
}
submitUser(user) {
Client.updateUser(user,
Client.updateUser(user, Constants.UserUpdateEvents.LANGUAGE,
() => {
GlobalActions.newLocalizationSelected(user.locale);
},

Просмотреть файл

@@ -97,6 +97,7 @@ class UserSettingsGeneralTab extends React.Component {
this.state = this.setupInitialState(props);
this.setState({maxFileSize: global.window.mm_config.MaxFileSize});
}
submitUsername(e) {
e.preventDefault();
@@ -120,8 +121,9 @@ class UserSettingsGeneralTab extends React.Component {
user.username = username;
this.submitUser(user, false);
this.submitUser(user, Constants.UserUpdateEvents.USERNAME, false);
}
submitNickname(e) {
e.preventDefault();
@@ -135,8 +137,9 @@ class UserSettingsGeneralTab extends React.Component {
user.nickname = nickname;
this.submitUser(user, false);
this.submitUser(user, Constants.UserUpdateEvents.NICKNAME, false);
}
submitName(e) {
e.preventDefault();
@@ -152,8 +155,9 @@ class UserSettingsGeneralTab extends React.Component {
user.first_name = firstName;
user.last_name = lastName;
this.submitUser(user, false);
this.submitUser(user, Constants.UserUpdateEvents.FULLNAME, false);
}
submitEmail(e) {
e.preventDefault();
@@ -179,10 +183,11 @@ class UserSettingsGeneralTab extends React.Component {
}
user.email = email;
this.submitUser(user, true);
this.submitUser(user, Constants.UserUpdateEvents.EMAIL, true);
}
submitUser(user, emailUpdated) {
Client.updateUser(user,
submitUser(user, type, emailUpdated) {
Client.updateUser(user, type,
() => {
this.updateSection('');
AsyncClient.getMe();
@@ -205,6 +210,7 @@ class UserSettingsGeneralTab extends React.Component {
}
);
}
submitPicture(e) {
e.preventDefault();
@@ -242,24 +248,31 @@ class UserSettingsGeneralTab extends React.Component {
}
);
}
updateUsername(e) {
this.setState({username: e.target.value});
}
updateFirstName(e) {
this.setState({firstName: e.target.value});
}
updateLastName(e) {
this.setState({lastName: e.target.value});
}
updateNickname(e) {
this.setState({nickname: e.target.value});
}
updateEmail(e) {
this.setState({email: e.target.value});
}
updateConfirmEmail(e) {
this.setState({confirmEmail: e.target.value});
}
updatePicture(e) {
if (e.target.files && e.target.files[0]) {
this.setState({picture: e.target.files[0]});
@@ -270,6 +283,7 @@ class UserSettingsGeneralTab extends React.Component {
this.setState({picture: null});
}
}
updateSection(section) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
const emailChangeInProgress = this.state.emailChangeInProgress;
@@ -277,12 +291,14 @@ class UserSettingsGeneralTab extends React.Component {
this.submitActive = false;
this.props.updateSection(section);
}
setupInitialState(props) {
const user = props.user;
return {username: user.username, firstName: user.first_name, lastName: user.last_name, nickname: user.nickname,
email: user.email, confirmEmail: '', picture: null, loadingPicture: false, emailChangeInProgress: false};
}
createEmailSection() {
let emailSection;
@@ -526,6 +542,7 @@ class UserSettingsGeneralTab extends React.Component {
return emailSection;
}
render() {
const user = this.props.user;
const {formatMessage} = this.props.intl;

Просмотреть файл

@@ -111,7 +111,7 @@ export default class ThemeSetting extends React.Component {
var user = UserStore.getCurrentUser();
user.theme_props = this.state.theme;
Client.updateUser(user,
Client.updateUser(user, Constants.UserUpdateEvents.THEME,
(data) => {
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_ME,