fix JS errors in saving preferences - for user's display (including custom theme vector) and advanced settings (#6764)
Этот коммит содержится в:
коммит произвёл
George Goldberg
родитель
9659a6da06
Коммит
e2daa425fa
@@ -391,7 +391,7 @@ export function saveTheme(teamId, theme, cb) {
|
|||||||
value: JSON.stringify(theme)
|
value: JSON.stringify(theme)
|
||||||
}];
|
}];
|
||||||
|
|
||||||
savePreferences(currentUserId, preference)(dispatch, getState).then(
|
savePreferencesRedux(currentUserId, preference)(dispatch, getState).then(
|
||||||
() => {
|
() => {
|
||||||
onThemeSaved(teamId, theme, cb);
|
onThemeSaved(teamId, theme, cb);
|
||||||
}
|
}
|
||||||
@@ -793,17 +793,10 @@ export function loadMyTeamMembers() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function savePreferences(prefs, success, error) {
|
export function savePreferences(prefs, callback) {
|
||||||
const currentUserId = UserStore.getCurrentId();
|
const currentUserId = UserStore.getCurrentId();
|
||||||
savePreferencesRedux(currentUserId, prefs)(dispatch, getState).then(
|
savePreferencesRedux(currentUserId, prefs)(dispatch, getState).then(
|
||||||
(data) => {
|
() => callback()
|
||||||
if (data && success) {
|
|
||||||
success(data);
|
|
||||||
} else if (data == null && error) {
|
|
||||||
const serverError = getState().requests.preferences.savePreferences.error;
|
|
||||||
error({id: serverError.server_error_id, ...serverError});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -137,9 +137,6 @@ export default class AdvancedSettingsDisplay extends React.Component {
|
|||||||
preferences,
|
preferences,
|
||||||
() => {
|
() => {
|
||||||
this.updateSection('');
|
this.updateSection('');
|
||||||
},
|
|
||||||
(err) => {
|
|
||||||
this.setState({serverError: err.message});
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,9 +94,6 @@ export default class UserSettingsDisplay extends React.Component {
|
|||||||
savePreferences([timePreference, namePreference, fontPreference, channelDisplayModePreference, messageDisplayPreference, collapseDisplayPreference],
|
savePreferences([timePreference, namePreference, fontPreference, channelDisplayModePreference, messageDisplayPreference, collapseDisplayPreference],
|
||||||
() => {
|
() => {
|
||||||
this.updateSection('');
|
this.updateSection('');
|
||||||
},
|
|
||||||
(err) => {
|
|
||||||
this.setState({serverError: err.message});
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user