Additional stuff for #607

validatorjs · Nov 28, 2016 · 69f63bd · 69f63bd
1 parent 19bd81b
commit 69f63bd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 #### HEAD
+- Added an option to require an email display name
+  ([#607](https://github.com/chriso/validator.js/pull/607))
 - Added support for `lt` and `gt` to `isInt()`
   ([#588](https://github.com/chriso/validator.js/pull/588))
 - New locales

diff --git a/lib/isEmail.js b/lib/isEmail.js
@@ -86,4 +86,4 @@ function isEmail(str, options) {
 
   return true;
 }
-module.exports = exports['default'];
+module.exports = exports['default'];
diff --git a/src/lib/isEmail.js b/src/lib/isEmail.js
@@ -25,11 +25,7 @@ export default function isEmail(str, options) {
   assertString(str);
   options = merge(options, default_email_options);
 
-  if (options.require_display_name) {
-    options.allow_display_name = true;
-  }
-
-  if (options.allow_display_name) {
+  if (options.require_display_name || options.allow_display_name) {
     const display_email = str.match(displayName);
     if (display_email) {
       str = display_email[1];

diff --git a/validator.js b/validator.js
@@ -296,11 +296,7 @@
         assertString(str);
         options = merge(options, default_email_options);
 
-        if (options.require_display_name) {
-          options.allow_display_name = true;
-        }
-
-        if (options.allow_display_name) {
+        if (options.require_display_name || options.allow_display_name) {
           var display_email = str.match(displayName);
           if (display_email) {
             str = display_email[1];