Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: move app.alert back into the conditionals

Browse Source
This commit is contained in:
Julian Lam
2021-09-01 10:41:28 -04:00
parent 1bd1cc74a4
commit ca9bae3a1c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/app.js
View File

@@ -774,6 +774,7 @@ app.cacheBuster = null;
app.removeAlert('email_confirm'); app.removeAlert('email_confirm');
ajaxify.go('user/' + app.user.userslug + '/edit/email'); ajaxify.go('user/' + app.user.userslug + '/edit/email');
}; };
app.alert(msg);
} else if (!app.user['email:confirmed'] && !app.user.isEmailConfirmSent) { } else if (!app.user['email:confirmed'] && !app.user.isEmailConfirmSent) {
msg.message = err ? err.message : '[[error:email-not-confirmed]]'; msg.message = err ? err.message : '[[error:email-not-confirmed]]';
msg.clickfn = function () { msg.clickfn = function () {
@@ -785,11 +786,11 @@ app.cacheBuster = null;
app.alertSuccess('[[notifications:email-confirm-sent]]'); app.alertSuccess('[[notifications:email-confirm-sent]]');
}); });
}; };
app.alert(msg);
} else if (!app.user['email:confirmed'] && app.user.isEmailConfirmSent) { } else if (!app.user['email:confirmed'] && app.user.isEmailConfirmSent) {
msg.message = '[[error:email-not-confirmed-email-sent]]'; msg.message = '[[error:email-not-confirmed-email-sent]]';
}
app.alert(msg); app.alert(msg);
}
}; };
app.parseAndTranslate = function (template, blockName, data, callback) { app.parseAndTranslate = function (template, blockName, data, callback) {