simplify logic

This commit is contained in:
Jeff Williams 2014-04-12 20:13:57 -07:00
parent 97dc742654
commit 7dfefd7910

View File

@ -28,14 +28,10 @@ exports.validate = function(tag, tagDef, meta) {
if (!tagDef && !env.conf.tags.allowUnknownTags) { if (!tagDef && !env.conf.tags.allowUnknownTags) {
logger.error( buildMessage(tag.title, meta, 'is not a known tag') ); logger.error( buildMessage(tag.title, meta, 'is not a known tag') );
} }
else if (!tag.text) { else if (!tag.text && tagDef.mustHaveValue) {
if (tagDef.mustHaveValue) {
logger.error( buildMessage(tag.title, meta, 'requires a value') ); logger.error( buildMessage(tag.title, meta, 'requires a value') );
} }
} else if (tag.text && tagDef.mustNotHaveValue) {
else {
if (tagDef.mustNotHaveValue) {
logger.error( buildMessage(tag.title, meta, 'does not permit a value') ); logger.error( buildMessage(tag.title, meta, 'does not permit a value') );
} }
}
}; };