clear prior message; msg tweak for empty field
This commit is contained in:
parent
5998144071
commit
0161c22401
|
@ -167,6 +167,7 @@ exports.FullScreenEditorModule =
|
||||||
var newFocusViewId;
|
var newFocusViewId;
|
||||||
if (errMsgView) {
|
if (errMsgView) {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
errMsgView.clearText();
|
||||||
errMsgView.setText(err.message);
|
errMsgView.setText(err.message);
|
||||||
|
|
||||||
if (MciViewIds.header.subject === err.view.getId()) {
|
if (MciViewIds.header.subject === err.view.getId()) {
|
||||||
|
|
|
@ -21,8 +21,10 @@ exports.validateEmailAvail = validateEmailAvail;
|
||||||
exports.validateBirthdate = validateBirthdate;
|
exports.validateBirthdate = validateBirthdate;
|
||||||
exports.validatePasswordSpec = validatePasswordSpec;
|
exports.validatePasswordSpec = validatePasswordSpec;
|
||||||
|
|
||||||
|
const emptyFieldError = () => new Error('Field cannot be empty');
|
||||||
|
|
||||||
function validateNonEmpty(data, cb) {
|
function validateNonEmpty(data, cb) {
|
||||||
return cb(data && data.length > 0 ? null : new Error('Field cannot be empty'));
|
return cb(data && data.length > 0 ? null : emptyFieldError);
|
||||||
}
|
}
|
||||||
|
|
||||||
function validateMessageSubject(data, cb) {
|
function validateMessageSubject(data, cb) {
|
||||||
|
@ -91,6 +93,10 @@ function validateGeneralMailAddressedTo(data, cb) {
|
||||||
// :TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
|
// :TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
|
||||||
const addressedToInfo = getAddressedToInfo(data);
|
const addressedToInfo = getAddressedToInfo(data);
|
||||||
|
|
||||||
|
if (addressedToInfo.name.length === 0) {
|
||||||
|
return cb(emptyFieldError());
|
||||||
|
}
|
||||||
|
|
||||||
if (Message.AddressFlavor.Local !== addressedToInfo.flavor) {
|
if (Message.AddressFlavor.Local !== addressedToInfo.flavor) {
|
||||||
return cb(null);
|
return cb(null);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue