Port avatar restore to user profile settings

pull/21833/head
J. Ryan Stinnett 2021-02-05 14:11:57 +00:00
parent bccfdde4ac
commit 81bd919a18
1 changed files with 10 additions and 6 deletions

View File

@ -52,19 +52,23 @@ export default class ProfileSettings extends React.Component {
// clear file upload field so same file can be selected // clear file upload field so same file can be selected
this._avatarUpload.current.value = ""; this._avatarUpload.current.value = "";
this.setState({ this.setState({
avatarUrl: undefined, avatarUrl: null,
avatarFile: undefined, avatarFile: null,
enableProfileSave: true, enableProfileSave: true,
}); });
}; };
_clearProfile = async (e) => { _cancelProfileChanges = async (e) => {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
if (!this.state.enableProfileSave) return; if (!this.state.enableProfileSave) return;
this._removeAvatar(); this.setState({
this.setState({enableProfileSave: false, displayName: this.state.originalDisplayName}); enableProfileSave: false,
displayName: this.state.originalDisplayName,
avatarUrl: this.state.originalAvatarUrl,
avatarFile: null,
});
}; };
_saveProfile = async (e) => { _saveProfile = async (e) => {
@ -186,7 +190,7 @@ export default class ProfileSettings extends React.Component {
</div> </div>
<div className="mx_ProfileSettings_buttons"> <div className="mx_ProfileSettings_buttons">
<AccessibleButton <AccessibleButton
onClick={this._clearProfile} onClick={this._cancelProfileChanges}
kind="link" kind="link"
disabled={!this.state.enableProfileSave} disabled={!this.state.enableProfileSave}
> >