fomantic-ui 2.9.1-beta.22 → 2.9.1-beta.24

package/src/definitions/behaviors/form.js

@@ -15,7 +15,7 @@
         return typeof obj === 'function' && typeof obj.nodeType !== 'number';
     }
 
-    window = (typeof window != 'undefined' && window.Math == Math)
+    window = window !== undefined && window.Math === Math
         ? window
         : globalThis;
 
@@ -24,12 +24,12 @@
             $allModules      = $(this),
             moduleSelector   = $allModules.selector || '',
 
-            time             = new Date().getTime(),
+            time             = Date.now(),
             performance      = [],
 
             query            = arguments[0],
             legacyParameters = arguments[1],
-            methodInvoked    = (typeof query == 'string'),
+            methodInvoked    = typeof query === 'string',
             queryArguments   = [].slice.call(arguments, 1),
             returnedValue
         ;
@@ -136,7 +136,10 @@
                 },
 
                 attachEvents: function (selector, action) {
-                    action = action || 'submit';
+                    if (!action) {
+                        action = 'submit';
+                    }
+
                     $(selector).on('click' + eventNamespace, function (event) {
                         module[action]();
                         event.preventDefault();
@@ -193,7 +196,7 @@
                             defaultValue = $field.data(metadata.defaultValue) || '',
                             isCheckbox   = $element.is(selector.uiCheckbox),
                             isDropdown   = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'),
-                            isCalendar   = ($calendar.length > 0 && module.can.useElement('calendar')),
+                            isCalendar   = $calendar.length > 0 && module.can.useElement('calendar'),
                             isErrored    = $fieldGroup.hasClass(className.error)
                         ;
                         if (isErrored) {
@@ -227,7 +230,7 @@
                             defaultValue = $field.data(metadata.defaultValue),
                             isCheckbox   = $element.is(selector.uiCheckbox),
                             isDropdown   = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'),
-                            isCalendar   = ($calendar.length > 0 && module.can.useElement('calendar')),
+                            isCalendar   = $calendar.length > 0 && module.can.useElement('calendar'),
                             isErrored    = $fieldGroup.hasClass(className.error)
                         ;
                         if (defaultValue === undefined) {
@@ -260,7 +263,7 @@
                             allValid = true
                         ;
                         $.each(validation, function (fieldName, field) {
-                            if (!(module.validate.field(field, fieldName, true))) {
+                            if (!module.validate.field(field, fieldName, true)) {
                                 allValid = false;
                             }
                         });
@@ -273,19 +276,17 @@
                         $field.each(function (index, el) {
                             var
                                 $el = $(el),
-                                isCheckbox = ($el.filter(selector.checkbox).length > 0),
+                                isCheckbox = $el.filter(selector.checkbox).length > 0,
                                 isDirty
                             ;
 
-                            if (isCheckbox) {
-                                isDirty = module.is.checkboxDirty($el);
-                            } else {
-                                isDirty = module.is.fieldDirty($el);
-                            }
+                            isDirty = isCheckbox
+                                ? module.is.checkboxDirty($el)
+                                : module.is.fieldDirty($el);
 
                             $el.data(settings.metadata.isDirty, isDirty);
 
-                            formIsDirty |= isDirty;
+                            formIsDirty = formIsDirty || isDirty;
                         });
 
                         if (formIsDirty) {
@@ -298,20 +299,21 @@
 
                 is: {
                     bracketedRule: function (rule) {
-                        return (rule.type && rule.type.match(settings.regExp.bracket));
+                        return rule.type && rule.type.match(settings.regExp.bracket);
                     },
                     // duck type rule test
                     shorthandRules: function (rules) {
-                        return (typeof rules == 'string' || Array.isArray(rules));
+                        return typeof rules === 'string' || Array.isArray(rules);
                     },
                     empty: function ($field) {
                         if (!$field || $field.length === 0) {
                             return true;
-                        } else if ($field.is(selector.checkbox)) {
+                        }
+                        if ($field.is(selector.checkbox)) {
                             return !$field.is(':checked');
-                        } else {
-                            return module.is.blank($field);
                         }
+
+                        return module.is.blank($field);
                     },
                     blank: function ($field) {
                         return String($field.val()).trim() === '';
@@ -324,16 +326,16 @@
                             module.verbose('Checking if field is valid', field);
 
                             return module.validate.field(validation[field], field, !!showErrors);
-                        } else {
-                            module.verbose('Checking if form is valid');
-                            $.each(validation, function (fieldName, field) {
-                                if (!module.is.valid(fieldName, showErrors)) {
-                                    allValid = false;
-                                }
-                            });
-
-                            return allValid;
                         }
+
+                        module.verbose('Checking if form is valid');
+                        $.each(validation, function (fieldName, field) {
+                            if (!module.is.valid(fieldName, showErrors)) {
+                                allValid = false;
+                            }
+                        });
+
+                        return allValid;
                     },
                     dirty: function () {
                         return dirty;
@@ -374,10 +376,10 @@
                         return initialValue !== currentValue;
                     },
                     justDirty: function () {
-                        return (history[0] === 'dirty');
+                        return history[0] === 'dirty';
                     },
                     justClean: function () {
-                        return (history[0] === 'clean');
+                        return history[0] === 'clean';
                     },
                 },
 
@@ -395,7 +397,7 @@
                                 key          = event.which,
                                 isInput      = $field.is(selector.input),
                                 isCheckbox   = $field.is(selector.checkbox),
-                                isInDropdown = ($field.closest(selector.uiDropdown).length > 0),
+                                isInDropdown = $field.closest(selector.uiDropdown).length > 0,
                                 keyCode      = {
                                     enter: 13,
                                     escape: 27,
@@ -474,7 +476,7 @@
                             return false;
                         }
 
-                        return (rule.value !== undefined)
+                        return rule.value !== undefined
                             ? rule.value
                             : rule.type.match(settings.regExp.bracket)[1] + '';
                     },
@@ -488,16 +490,16 @@
                     changeEvent: function (type, $input) {
                         if (type == 'checkbox' || type == 'radio' || type == 'hidden' || $input.is('select')) {
                             return 'change';
-                        } else {
-                            return module.get.inputEvent();
                         }
+
+                        return module.get.inputEvent();
                     },
                     inputEvent: function () {
-                        return (document.createElement('input').oninput !== undefined)
+                        return document.createElement('input').oninput !== undefined
                             ? 'input'
-                            : (document.createElement('input').onpropertychange !== undefined)
+                            : (document.createElement('input').onpropertychange !== undefined
                                 ? 'propertychange'
-                                : 'keyup';
+                                : 'keyup');
                     },
                     fieldsFromShorthand: function (fields) {
                         var
@@ -507,7 +509,7 @@
                             if (!Array.isArray(rules) && typeof rules === 'object') {
                                 fullFields[name] = rules;
                             } else {
-                                if (typeof rules == 'string') {
+                                if (typeof rules === 'string') {
                                     rules = [rules];
                                 }
                                 fullFields[name] = {
@@ -530,8 +532,8 @@
                             prompt        = isFunction(rule.prompt)
                                 ? rule.prompt(value)
                                 : rule.prompt || settings.prompt[ruleName] || settings.text.unspecifiedRule,
-                            requiresValue = (prompt.search('{value}') !== -1),
-                            requiresName  = (prompt.search('{name}') !== -1),
+                            requiresValue = prompt.search('{value}') !== -1,
+                            requiresName  = prompt.search('{name}') !== -1,
                             $label,
                             name,
                             parts,
@@ -540,30 +542,28 @@
                         if (ancillary && ['integer', 'decimal', 'number'].indexOf(ruleName) >= 0 && ancillary.indexOf('..') >= 0) {
                             parts = ancillary.split('..', 2);
                             if (!rule.prompt) {
-                                suffixPrompt = (
-                                    parts[0] === ''
-                                        ? settings.prompt.maxValue.replace(/\{ruleValue\}/g, '{max}')
-                                        : parts[1] === ''
-                                            ? settings.prompt.minValue.replace(/\{ruleValue\}/g, '{min}')
-                                            : settings.prompt.range
-                                );
-                                prompt += suffixPrompt.replace(/\{name\}/g, ' ' + settings.text.and);
+                                suffixPrompt = parts[0] === ''
+                                    ? settings.prompt.maxValue.replace(/{ruleValue}/g, '{max}')
+                                    : (parts[1] === ''
+                                        ? settings.prompt.minValue.replace(/{ruleValue}/g, '{min}')
+                                        : settings.prompt.range);
+                                prompt += suffixPrompt.replace(/{name}/g, ' ' + settings.text.and);
                             }
-                            prompt = prompt.replace(/\{min\}/g, parts[0]);
-                            prompt = prompt.replace(/\{max\}/g, parts[1]);
+                            prompt = prompt.replace(/{min}/g, parts[0]);
+                            prompt = prompt.replace(/{max}/g, parts[1]);
                         }
                         if (requiresValue) {
-                            prompt = prompt.replace(/\{value\}/g, $field.val());
+                            prompt = prompt.replace(/{value}/g, $field.val());
                         }
                         if (requiresName) {
                             $label = $field.closest(selector.group).find('label').eq(0);
-                            name = ($label.length == 1)
+                            name = $label.length == 1
                                 ? $label.text()
                                 : $field.prop('placeholder') || settings.text.unspecifiedField;
-                            prompt = prompt.replace(/\{name\}/g, name);
+                            prompt = prompt.replace(/{name}/g, name);
                         }
-                        prompt = prompt.replace(/\{identifier\}/g, field.identifier);
-                        prompt = prompt.replace(/\{ruleValue\}/g, ancillary);
+                        prompt = prompt.replace(/{identifier}/g, field.identifier);
+                        prompt = prompt.replace(/{ruleValue}/g, ancillary);
                         if (!rule.prompt) {
                             module.verbose('Using default validation prompt for type', prompt, ruleName);
                         }
@@ -574,8 +574,8 @@
                         if ($.isPlainObject(parameters)) {
                             var
                                 keys     = Object.keys(parameters),
-                                isLegacySettings = (keys.length > 0)
-                                    ? (parameters[keys[0]].identifier !== undefined && parameters[keys[0]].rules !== undefined)
+                                isLegacySettings = keys.length > 0
+                                    ? parameters[keys[0]].identifier !== undefined && parameters[keys[0]].rules !== undefined
                                     : false
                             ;
                             if (isLegacySettings) {
@@ -619,16 +619,20 @@
                         module.verbose('Finding field with identifier', identifier);
                         identifier = module.escape.string(identifier);
                         var t;
-                        if ((t = $field.filter('#' + identifier)).length > 0) {
+                        t = $field.filter('#' + identifier);
+                        if (t.length > 0) {
                             return t;
                         }
-                        if ((t = $field.filter('[name="' + identifier + '"]')).length > 0) {
+                        t = $field.filter('[name="' + identifier + '"]');
+                        if (t.length > 0) {
                             return t;
                         }
-                        if ((t = $field.filter('[name="' + identifier + '[]"]')).length > 0) {
+                        t = $field.filter('[name="' + identifier + '[]"]');
+                        if (t.length > 0) {
                             return t;
                         }
-                        if ((t = $field.filter('[data-' + metadata.validate + '="' + identifier + '"]')).length > 0) {
+                        t = $field.filter('[data-' + metadata.validate + '="' + identifier + '"]');
+                        if (t.length > 0) {
                             return t;
                         }
                         module.error(error.noField.replace('{identifier}', identifier));
@@ -692,9 +696,9 @@
                                 value        = $field.val(),
                                 isCheckbox   = $field.is(selector.checkbox),
                                 isRadio      = $field.is(selector.radio),
-                                isMultiple   = (name.indexOf('[]') !== -1),
-                                isCalendar   = ($calendar.length > 0 && module.can.useElement('calendar')),
-                                isChecked    = (isCheckbox)
+                                isMultiple   = name.indexOf('[]') !== -1,
+                                isCalendar   = $calendar.length > 0 && module.can.useElement('calendar'),
+                                isChecked    = isCheckbox
                                     ? $field.is(':checked')
                                     : false
                             ;
@@ -716,16 +720,12 @@
                                 } else {
                                     if (isRadio) {
                                         if (values[name] === undefined || values[name] === false) {
-                                            values[name] = (isChecked)
+                                            values[name] = isChecked
                                                 ? value || true
                                                 : false;
                                         }
                                     } else if (isCheckbox) {
-                                        if (isChecked) {
-                                            values[name] = value || true;
-                                        } else {
-                                            values[name] = false;
-                                        }
+                                        values[name] = isChecked ? value || true : false;
                                     } else if (isCalendar) {
                                         var date = $calendar.calendar('get date');
 
@@ -855,7 +855,7 @@
                         $.each(newValidation.rules, function (_index, rule) {
                             if ($.grep(validation[name].rules, function (item) {
                                 return item.type == rule.type;
-                            }).length == 0) {
+                            }).length === 0) {
                                 validation[name].rules.push(rule);
                             }
                         });
@@ -871,9 +871,9 @@
                             $field       = module.get.field(identifier),
                             $fieldGroup  = $field.closest($group),
                             $prompt      = $fieldGroup.children(selector.prompt),
-                            promptExists = ($prompt.length !== 0)
+                            promptExists = $prompt.length > 0
                         ;
-                        errors = (typeof errors == 'string')
+                        errors = typeof errors === 'string'
                             ? [errors]
                             : errors;
                         module.verbose('Adding field error state', identifier);
@@ -1012,11 +1012,11 @@
                             var
                                 $el        = $(el),
                                 $parent    = $el.parent(),
-                                isCheckbox = ($el.filter(selector.checkbox).length > 0),
+                                isCheckbox = $el.filter(selector.checkbox).length > 0,
                                 isDropdown = $parent.is(selector.uiDropdown) && module.can.useElement('dropdown'),
                                 $calendar   = $el.closest(selector.uiCalendar),
-                                isCalendar  = ($calendar.length > 0 && module.can.useElement('calendar')),
-                                value      = (isCheckbox)
+                                isCalendar  = $calendar.length > 0 && module.can.useElement('calendar'),
+                                value      = isCheckbox
                                     ? $el.is(':checked')
                                     : $el.val()
                             ;
@@ -1055,9 +1055,9 @@
                                 isMultiple  = Array.isArray(value),
                                 isCheckbox  = $element.is(selector.uiCheckbox) && module.can.useElement('checkbox'),
                                 isDropdown  = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'),
-                                isRadio     = ($field.is(selector.radio) && isCheckbox),
-                                isCalendar  = ($calendar.length > 0 && module.can.useElement('calendar')),
-                                fieldExists = ($field.length > 0),
+                                isRadio     = $field.is(selector.radio) && isCheckbox,
+                                isCalendar  = $calendar.length > 0 && module.can.useElement('calendar'),
+                                fieldExists = $field.length > 0,
                                 $multipleField
                             ;
                             if (fieldExists) {
@@ -1133,7 +1133,7 @@
                             var
                                 $el        = $(el),
                                 $elGroup   = $el.closest($group),
-                                isCheckbox = ($el.filter(selector.checkbox).length > 0),
+                                isCheckbox = $el.filter(selector.checkbox).length > 0,
                                 isRequired = $el.prop('required') || $elGroup.hasClass(className.required) || $elGroup.parent().hasClass(className.required),
                                 isDisabled = $el.is(':disabled') || $elGroup.hasClass(className.disabled) || $elGroup.parent().hasClass(className.disabled),
                                 validation = module.get.validation($el),
@@ -1156,7 +1156,7 @@
                         });
                     },
                     optional: function (identifier, bool) {
-                        bool = (bool !== false);
+                        bool = bool !== false;
                         $.each(validation, function (fieldName, field) {
                             if (identifier == fieldName || identifier == field.identifier) {
                                 field.optional = bool;
@@ -1226,10 +1226,10 @@
 
                     // takes a validation object and returns whether field passes validation
                     field: function (field, fieldName, showErrors) {
-                        showErrors = (showErrors !== undefined)
+                        showErrors = showErrors !== undefined
                             ? showErrors
                             : true;
-                        if (typeof field == 'string') {
+                        if (typeof field === 'string') {
                             module.verbose('Validating field', field);
                             fieldName = field;
                             field = validation[field];
@@ -1237,7 +1237,7 @@
                         var
                             identifier    = field.identifier || fieldName,
                             $field        = module.get.field(identifier),
-                            $dependsField = (field.depends)
+                            $dependsField = field.depends
                                 ? module.get.field(field.depends)
                                 : false,
                             fieldValid  = true,
@@ -1247,7 +1247,7 @@
                             module.debug('Using field name as identifier', identifier);
                             field.identifier = identifier;
                         }
-                        var isDisabled = !$field.filter(':not(:disabled)').length;
+                        var isDisabled = $field.filter(':not(:disabled)').length === 0;
                         if (isDisabled) {
                             module.debug('Field is disabled. Skipping', identifier);
                         } else if (field.optional && module.is.blank($field)) {
@@ -1300,11 +1300,13 @@
                             invalidFields = [],
                             isCheckbox = $field.is(selector.checkbox),
                             isValid = function (field) {
-                                var value = (isCheckbox ? $(field).filter(':checked').val() : $(field).val());
+                                var value = isCheckbox ? $(field).filter(':checked').val() : $(field).val();
                                 // cast to string avoiding encoding special values
-                                value = (value === undefined || value === '' || value === null)
+                                value = value === undefined || value === '' || value === null
                                     ? ''
-                                    : (settings.shouldTrim && rule.shouldTrim !== false) || rule.shouldTrim ? String(value + '').trim() : String(value + '');
+                                    : ((settings.shouldTrim && rule.shouldTrim !== false) || rule.shouldTrim
+                                        ? String(value + '').trim()
+                                        : String(value + ''));
 
                                 return ruleFunction.call(field, value, ancillary, $module);
                             }
@@ -1326,7 +1328,7 @@
                             });
                         }
 
-                        return internal ? invalidFields : !(invalidFields.length > 0);
+                        return internal ? invalidFields : invalidFields.length === 0;
                     },
                 },
 
@@ -1382,7 +1384,7 @@
                             previousTime
                         ;
                         if (settings.performance) {
-                            currentTime = new Date().getTime();
+                            currentTime = Date.now();
                             previousTime = time || currentTime;
                             executionTime = currentTime - previousTime;
                             time = currentTime;
@@ -1411,7 +1413,7 @@
                             title += ' \'' + moduleSelector + '\'';
                         }
                         if ($allModules.length > 1) {
-                            title += ' ' + '(' + $allModules.length + ')';
+                            title += ' (' + $allModules.length + ')';
                         }
                         if ((console.group !== undefined || console.table !== undefined) && performance.length > 0) {
                             console.groupCollapsed(title);
@@ -1436,11 +1438,11 @@
                     ;
                     passedArguments = passedArguments || queryArguments;
                     context = context || element;
-                    if (typeof query == 'string' && object !== undefined) {
-                        query = query.split(/[\. ]/);
+                    if (typeof query === 'string' && object !== undefined) {
+                        query = query.split(/[ .]/);
                         maxDepth = query.length - 1;
                         $.each(query, function (depth, value) {
-                            var camelCaseValue = (depth != maxDepth)
+                            var camelCaseValue = depth != maxDepth
                                 ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
                                 : query;
                             if ($.isPlainObject(object[camelCaseValue]) && (depth != maxDepth)) {
@@ -1479,7 +1481,7 @@
             module.initialize();
         });
 
-        return (returnedValue !== undefined)
+        return returnedValue !== undefined
             ? returnedValue
             : this;
     };
@@ -1529,15 +1531,15 @@
         },
 
         regExp: {
-            htmlID: /^[a-zA-Z][\w:.-]*$/g,
-            bracket: /\[(.*)\]/i,
+            htmlID: /^[A-Za-z][\w.:-]*$/g,
+            bracket: /\[(.*)]/i,
             decimal: /^\d+\.?\d*$/,
-            email: /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,
-            escape: /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|:,=@]/g,
+            email: /^[\w!#$%&'*+./=?^`{|}~-]+@[\da-z]([\da-z-]*[\da-z])?(\.[\da-z]([\da-z-]*[\da-z])?)*$/i,
+            escape: /[$()*+,./:=?@[\\\]^{|}-]/g,
             flags: /^\/(.*)\/(.*)?/,
-            integer: /^\-?\d+$/,
-            number: /^\-?\d*(\.\d+)?$/,
-            url: /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/i,
+            integer: /^-?\d+$/,
+            number: /^-?\d*(\.\d+)?$/,
+            url: /(https?:\/\/(?:www\.|(?!www))[^\s.]+\.\S{2,}|www\.\S+\.\S{2,})/i,
         },
 
         text: {
@@ -1682,12 +1684,12 @@
 
             // is not empty or blank string
             empty: function (value) {
-                return !(value === undefined || '' === value || Array.isArray(value) && value.length === 0);
+                return !(value === undefined || value === '' || (Array.isArray(value) && value.length === 0));
             },
 
             // checkbox checked
             checked: function () {
-                return ($(this).filter(':checked').length > 0);
+                return $(this).filter(':checked').length > 0;
             },
 
             // is most likely an email
@@ -1711,10 +1713,10 @@
                 ;
                 // regular expression specified as /baz/gi (flags)
                 if (regExpParts) {
-                    regExp = (regExpParts.length >= 2)
+                    regExp = regExpParts.length >= 2
                         ? regExpParts[1]
                         : regExp;
-                    flags = (regExpParts.length >= 3)
+                    flags = regExpParts.length >= 3
                         ? regExpParts[2]
                         : '';
                 }
@@ -1732,7 +1734,7 @@
                 return $.fn.form.settings.rules.range(value, range, 'integer');
             },
             range: function (value, range, regExp) {
-                if (typeof regExp == 'string') {
+                if (typeof regExp === 'string') {
                     regExp = $.fn.form.settings.regExp[regExp];
                 }
                 if (!(regExp instanceof RegExp)) {
@@ -1744,10 +1746,12 @@
                     parts
                 ;
                 if (!range || ['', '..'].indexOf(range) !== -1) {
+
                     // do nothing
                 } else if (range.indexOf('..') == -1) {
                     if (regExp.test(range)) {
-                        min = max = range - 0;
+                        min = range - 0;
+                        max = min;
                     }
                 } else {
                     parts = range.split('..', 2);
@@ -1778,36 +1782,36 @@
 
             // is value (case insensitive)
             is: function (value, text) {
-                text = (typeof text == 'string')
+                text = typeof text === 'string'
                     ? text.toLowerCase()
                     : text;
-                value = (typeof value == 'string')
+                value = typeof value === 'string'
                     ? value.toLowerCase()
                     : value;
 
-                return (value == text);
+                return value == text;
             },
 
             // is value
             isExactly: function (value, text) {
-                return (value == text);
+                return value == text;
             },
 
             // value is not another value (case insensitive)
             not: function (value, notValue) {
-                value = (typeof value == 'string')
+                value = typeof value === 'string'
                     ? value.toLowerCase()
                     : value;
-                notValue = (typeof notValue == 'string')
+                notValue = typeof notValue === 'string'
                     ? notValue.toLowerCase()
                     : notValue;
 
-                return (value != notValue);
+                return value != notValue;
             },
 
             // value is not another value (case sensitive)
             notExactly: function (value, notValue) {
-                return (value != notValue);
+                return value != notValue;
             },
 
             // value contains text (insensitive)
@@ -1815,7 +1819,7 @@
                 // escape regex characters
                 text = text.replace($.fn.form.settings.regExp.escape, '\\$&');
 
-                return (value.search(new RegExp(text, 'i')) !== -1);
+                return value.search(new RegExp(text, 'i')) !== -1;
             },
 
             // value contains text (case sensitive)
@@ -1823,7 +1827,7 @@
                 // escape regex characters
                 text = text.replace($.fn.form.settings.regExp.escape, '\\$&');
 
-                return (value.search(new RegExp(text)) !== -1);
+                return value.search(new RegExp(text)) !== -1;
             },
 
             // value contains text (insensitive)
@@ -1831,7 +1835,7 @@
                 // escape regex characters
                 text = text.replace($.fn.form.settings.regExp.escape, '\\$&');
 
-                return (value.search(new RegExp(text, 'i')) === -1);
+                return value.search(new RegExp(text, 'i')) === -1;
             },
 
             // value contains text (case sensitive)
@@ -1839,27 +1843,27 @@
                 // escape regex characters
                 text = text.replace($.fn.form.settings.regExp.escape, '\\$&');
 
-                return (value.search(new RegExp(text)) === -1);
+                return value.search(new RegExp(text)) === -1;
             },
 
             // is at least string length
             minLength: function (value, requiredLength) {
-                return (value !== undefined)
-                    ? (value.length >= requiredLength)
+                return value !== undefined
+                    ? value.length >= requiredLength
                     : false;
             },
 
             // is exactly length
             exactLength: function (value, requiredLength) {
-                return (value !== undefined)
-                    ? (value.length == requiredLength)
+                return value !== undefined
+                    ? value.length == requiredLength
                     : false;
             },
 
             // is less than length
             maxLength: function (value, maxLength) {
-                return (value !== undefined)
-                    ? (value.length <= maxLength)
+                return value !== undefined
+                    ? value.length <= maxLength
                     : false;
             },
 
@@ -1869,18 +1873,28 @@
                     matchingValue,
                     matchingElement
                 ;
-                if ((matchingElement = $module.find('[data-validate="' + identifier + '"]')).length > 0) {
-                    matchingValue = matchingElement.val();
-                } else if ((matchingElement = $module.find('#' + identifier)).length > 0) {
+                matchingElement = $module.find('[data-validate="' + identifier + '"]');
+                if (matchingElement.length > 0) {
                     matchingValue = matchingElement.val();
-                } else if ((matchingElement = $module.find('[name="' + identifier + '"]')).length > 0) {
-                    matchingValue = matchingElement.val();
-                } else if ((matchingElement = $module.find('[name="' + identifier + '[]"]')).length > 0) {
-                    matchingValue = matchingElement;
+                } else {
+                    matchingElement = $module.find('#' + identifier);
+                    if (matchingElement.length > 0) {
+                        matchingValue = matchingElement.val();
+                    } else {
+                        matchingElement = $module.find('[name="' + identifier + '"]');
+                        if (matchingElement.length > 0) {
+                            matchingValue = matchingElement.val();
+                        } else {
+                            matchingElement = $module.find('[name="' + identifier + '[]"]');
+                            if (matchingElement.length > 0) {
+                                matchingValue = matchingElement;
+                            }
+                        }
+                    }
                 }
 
-                return (matchingValue !== undefined)
-                    ? (value.toString() == matchingValue.toString())
+                return matchingValue !== undefined
+                    ? value.toString() == matchingValue.toString()
                     : false;
             },
 
@@ -1891,18 +1905,28 @@
                     matchingValue,
                     matchingElement
                 ;
-                if ((matchingElement = $module.find('[data-validate="' + identifier + '"]')).length > 0) {
-                    matchingValue = matchingElement.val();
-                } else if ((matchingElement = $module.find('#' + identifier)).length > 0) {
+                matchingElement = $module.find('[data-validate="' + identifier + '"]');
+                if (matchingElement.length > 0) {
                     matchingValue = matchingElement.val();
-                } else if ((matchingElement = $module.find('[name="' + identifier + '"]')).length > 0) {
-                    matchingValue = matchingElement.val();
-                } else if ((matchingElement = $module.find('[name="' + identifier + '[]"]')).length > 0) {
-                    matchingValue = matchingElement;
+                } else {
+                    matchingElement = $module.find('#' + identifier);
+                    if (matchingElement.length > 0) {
+                        matchingValue = matchingElement.val();
+                    } else {
+                        matchingElement = $module.find('[name="' + identifier + '"]');
+                        if (matchingElement.length > 0) {
+                            matchingValue = matchingElement.val();
+                        } else {
+                            matchingElement = $module.find('[name="' + identifier + '[]"]');
+                            if (matchingElement.length > 0) {
+                                matchingValue = matchingElement;
+                            }
+                        }
+                    }
                 }
 
-                return (matchingValue !== undefined)
-                    ? (value.toString() !== matchingValue.toString())
+                return matchingValue !== undefined
+                    ? value.toString() !== matchingValue.toString()
                     : false;
             },
 
@@ -1922,7 +1946,7 @@
                             length: [16],
                         },
                         discover: {
-                            pattern: /^(6011|622(12[6-9]|1[3-9][0-9]|[2-8][0-9]{2}|9[0-1][0-9]|92[0-5]|64[4-9])|65)/,
+                            pattern: /^(6011|622(12[6-9]|1[3-9]\d|[2-8]\d{2}|9[01]\d|92[0-5]|64[4-9])|65)/,
                             length: [16],
                         },
                         unionPay: {
@@ -1930,7 +1954,7 @@
                             length: [16, 17, 18, 19],
                         },
                         jcb: {
-                            pattern: /^35(2[89]|[3-8][0-9])/,
+                            pattern: /^35(2[89]|[3-8]\d)/,
                             length: [16],
                         },
                         maestro: {
@@ -1952,7 +1976,7 @@
                     },
                     valid         = {},
                     validCard     = false,
-                    requiredTypes = (typeof cardTypes == 'string')
+                    requiredTypes = typeof cardTypes === 'string'
                         ? cardTypes.split(',')
                         : false,
                     unionPay,
@@ -1964,7 +1988,7 @@
                 }
 
                 // allow dashes and spaces in card
-                cardNumber = cardNumber.replace(/[\s\-]/g, '');
+                cardNumber = cardNumber.replace(/[\s-]/g, '');
 
                 // verify card types
                 if (requiredTypes) {
@@ -1973,10 +1997,10 @@
                         validation = cards[type];
                         if (validation) {
                             valid = {
-                                length: ($.inArray(cardNumber.length, validation.length) !== -1),
-                                pattern: (cardNumber.search(validation.pattern) !== -1),
+                                length: $.inArray(cardNumber.length, validation.length) !== -1,
+                                pattern: cardNumber.search(validation.pattern) !== -1,
                             };
-                            if (valid.length && valid.pattern) {
+                            if (valid.length > 0 && valid.pattern) {
                                 validCard = true;
                             }
                         }
@@ -1989,8 +2013,8 @@
 
                 // skip luhn for UnionPay
                 unionPay = {
-                    number: ($.inArray(cardNumber.length, cards.unionPay.length) !== -1),
-                    pattern: (cardNumber.search(cards.unionPay.pattern) !== -1),
+                    number: $.inArray(cardNumber.length, cards.unionPay.length) !== -1,
+                    pattern: cardNumber.search(cards.unionPay.pattern) !== -1,
                 };
                 if (unionPay.number && unionPay.pattern) {
                     return true;
@@ -2008,10 +2032,10 @@
                 ;
                 while (length--) {
                     sum += producedValue[multiple][parseInt(cardNumber.charAt(length), 10)];
-                    multiple ^= 1;
+                    multiple ^= 1; // eslint-disable-line no-bitwise
                 }
 
-                return (sum % 10 === 0 && sum > 0);
+                return sum % 10 === 0 && sum > 0;
             },
 
             minCount: function (value, minCount) {
@@ -2019,21 +2043,21 @@
                     return true;
                 }
                 if (minCount == 1) {
-                    return (value !== '');
+                    return value !== '';
                 }
 
-                return (value.split(',').length >= minCount);
+                return value.split(',').length >= minCount;
             },
 
             exactCount: function (value, exactCount) {
                 if (exactCount == 0) {
-                    return (value === '');
+                    return value === '';
                 }
                 if (exactCount == 1) {
-                    return (value !== '' && value.search(',') === -1);
+                    return value !== '' && value.search(',') === -1;
                 }
 
-                return (value.split(',').length == exactCount);
+                return value.split(',').length == exactCount;
             },
 
             maxCount: function (value, maxCount) {
@@ -2041,10 +2065,10 @@
                     return false;
                 }
                 if (maxCount == 1) {
-                    return (value.search(',') === -1);
+                    return value.search(',') === -1;
                 }
 
-                return (value.split(',').length <= maxCount);
+                return value.split(',').length <= maxCount;
             },
         },