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

REFACTOR: preferences/email controller ()

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2019-05-29 15:53:42 +02:00 committed by GitHub
parent 5e7e32510a
commit f2858e03c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions

31
app/assets/javascripts/discourse/controllers/preferences/email.js.es6
View File

@ -11,6 +11,7 @@ export default Ember.Controller.extend({
newEmail: null, newEmail: null,
newEmailEmpty: Ember.computed.empty("newEmail"), newEmailEmpty: Ember.computed.empty("newEmail"),
saveDisabled: Ember.computed.or( saveDisabled: Ember.computed.or(
"saving", "saving",
"newEmailEmpty", "newEmailEmpty",
@ -18,17 +19,8 @@ export default Ember.Controller.extend({
"unchanged", "unchanged",
"invalidEmail" "invalidEmail"
), ),
unchanged: propertyEqual("newEmailLower", "currentUser.email"),
reset() { unchanged: propertyEqual("newEmailLower", "currentUser.email"),
this.setProperties({
taken: false,
saving: false,
error: false,
success: false,
newEmail: null
});
},
@computed("newEmail") @computed("newEmail")
newEmailLower(newEmail) { newEmailLower(newEmail) {
@ -56,23 +48,32 @@ export default Ember.Controller.extend({
} }
}, },
reset() {
this.setProperties({
taken: false,
saving: false,
error: false,
success: false,
newEmail: null
});
},
actions: { actions: {
changeEmail() { changeEmail() {
const self = this;
this.set("saving", true); this.set("saving", true);
return this.model.changeEmail(this.newEmail).then( return this.model.changeEmail(this.newEmail).then(
() => self.set("success", true), () => this.set("success", true),
e => { e => {
self.setProperties({ error: true, saving: false }); this.setProperties({ error: true, saving: false });
if ( if (
e.jqXHR.responseJSON && e.jqXHR.responseJSON &&
e.jqXHR.responseJSON.errors && e.jqXHR.responseJSON.errors &&
e.jqXHR.responseJSON.errors[0] e.jqXHR.responseJSON.errors[0]
) { ) {
self.set("errorMessage", e.jqXHR.responseJSON.errors[0]); this.set("errorMessage", e.jqXHR.responseJSON.errors[0]);
} else { } else {
self.set("errorMessage", I18n.t("user.change_email.error")); this.set("errorMessage", I18n.t("user.change_email.error"));
} }
} }
); );