fomantic-ui 2.10.0-beta.1 → 2.10.0-beta.10

package/dist/components/form.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.10.0-beta.1+bee406e - Form Validation
+ * # Fomantic-UI 2.10.0-beta.10+3ca268e - Form Validation
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -20,58 +20,54 @@
         : globalThis;
 
     $.fn.form = function (parameters) {
-        var
-            $allModules      = $(this),
-            $window        = $(window),
-
-            time             = Date.now(),
-            performance      = [],
-
-            query            = arguments[0],
-            methodInvoked    = typeof query === 'string',
-            queryArguments   = [].slice.call(arguments, 1),
-            returnedValue
-        ;
+        let $allModules = $(this);
+        let $window = $(window);
+
+        let time = Date.now();
+        let performance = [];
+
+        let query = arguments[0];
+        let methodInvoked = typeof query === 'string';
+        let queryArguments = [].slice.call(arguments, 1);
+        let returnedValue;
         $allModules.each(function () {
-            var
-                $module     = $(this),
-                element     = this,
-
-                formErrors  = [],
-                formErrorsTracker = {},
-                keyHeldDown = false,
-
-                // set at run-time
-                $field,
-                $group,
-                $message,
-                $prompt,
-                $submit,
-                $clear,
-                $reset,
-
-                settings,
-                validation,
-
-                metadata,
-                selector,
-                className,
-                regExp,
-                error,
-
-                namespace,
-                moduleNamespace,
-                eventNamespace,
-                attachEventsSelector,
-                attachEventsAction,
-
-                submitting = false,
-                dirty = false,
-                history = ['clean', 'clean'],
-
-                instance,
-                module
-            ;
+            let $module = $(this);
+            let element = this;
+
+            let formErrors = [];
+            let formErrorsTracker = {};
+            let keyHeldDown = false;
+
+            // set at run-time
+            let $field;
+            let $group;
+            let $message;
+            let $prompt;
+            let $submit;
+            let $clear;
+            let $reset;
+
+            let settings;
+            let validation;
+
+            let metadata;
+            let selector;
+            let className;
+            let regExp;
+            let error;
+
+            let namespace;
+            let moduleNamespace;
+            let eventNamespace;
+            let attachEventsSelector;
+            let attachEventsAction;
+
+            let submitting = false;
+            let dirty = false;
+            let history = ['clean', 'clean'];
+
+            let instance;
+            let module;
 
             module = {
 
@@ -103,16 +99,14 @@
                     module.verbose('Storing instance of module', module);
                     instance = module;
                     $module
-                        .data(moduleNamespace, module)
-                    ;
+                        .data(moduleNamespace, module);
                 },
 
                 destroy: function () {
                     module.verbose('Destroying previous module', instance);
                     module.removeEvents();
                     $module
-                        .removeData(moduleNamespace)
-                    ;
+                        .removeData(moduleNamespace);
                 },
 
                 refresh: function () {
@@ -162,18 +156,15 @@
                         .on('blur' + eventNamespace, selector.field, module.event.field.blur)
                         .on('click' + eventNamespace, selector.submit, module.submit)
                         .on('click' + eventNamespace, selector.reset, module.reset)
-                        .on('click' + eventNamespace, selector.clear, module.clear)
-                    ;
+                        .on('click' + eventNamespace, selector.clear, module.clear);
                     $field.on('invalid' + eventNamespace, module.event.field.invalid);
                     if (settings.keyboardShortcuts) {
                         $module.on('keydown' + eventNamespace, selector.field, module.event.field.keydown);
                     }
                     $field.each(function (index, el) {
-                        var
-                            $input     = $(el),
-                            type       = $input.prop('type'),
-                            inputEvent = module.get.changeEvent(type, $input)
-                        ;
+                        let $input = $(el);
+                        let type = $input.prop('type');
+                        let inputEvent = module.get.changeEvent(type, $input);
                         $input.on(inputEvent + eventNamespace, module.event.field.change);
                     });
 
@@ -204,18 +195,16 @@
 
                 clear: function () {
                     $field.each(function (index, el) {
-                        var
-                            $field       = $(el),
-                            $element     = $field.parent(),
-                            $fieldGroup  = $field.closest($group),
-                            $prompt      = $fieldGroup.find(selector.prompt),
-                            $calendar    = $field.closest(selector.uiCalendar),
-                            defaultValue = $field.data(metadata.defaultValue) || '',
-                            isCheckbox   = $field.is(selector.checkbox),
-                            isDropdown   = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'),
-                            isCalendar   = $calendar.length > 0 && module.can.useElement('calendar'),
-                            isErrored    = $fieldGroup.hasClass(className.error)
-                        ;
+                        let $field = $(el);
+                        let $element = $field.parent();
+                        let $fieldGroup = $field.closest($group);
+                        let $prompt = $fieldGroup.find(selector.prompt);
+                        let $calendar = $field.closest(selector.uiCalendar);
+                        let defaultValue = $field.data(metadata.defaultValue) || '';
+                        let isCheckbox = $field.is(selector.checkbox);
+                        let isDropdown = $element.is(selector.uiDropdown) && module.can.useElement('dropdown');
+                        let isCalendar = $calendar.length > 0 && module.can.useElement('calendar');
+                        let isErrored = $fieldGroup.hasClass(className.error);
                         if (isErrored) {
                             module.verbose('Resetting error on field', $fieldGroup);
                             $fieldGroup.removeClass(className.error);
@@ -238,19 +227,17 @@
 
                 reset: function () {
                     $field.each(function (index, el) {
-                        var
-                            $field       = $(el),
-                            $element     = $field.parent(),
-                            $fieldGroup  = $field.closest($group),
-                            $calendar    = $field.closest(selector.uiCalendar),
-                            $prompt      = $fieldGroup.find(selector.prompt),
-                            defaultValue = $field.data(metadata.defaultValue),
-                            isCheckbox   = $field.is(selector.checkbox),
-                            isDropdown   = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'),
-                            isCalendar   = $calendar.length > 0 && module.can.useElement('calendar'),
-                            isFile       = $field.is(selector.file),
-                            isErrored    = $fieldGroup.hasClass(className.error)
-                        ;
+                        let $field = $(el);
+                        let $element = $field.parent();
+                        let $fieldGroup = $field.closest($group);
+                        let $calendar = $field.closest(selector.uiCalendar);
+                        let $prompt = $fieldGroup.find(selector.prompt);
+                        let defaultValue = $field.data(metadata.defaultValue);
+                        let isCheckbox = $field.is(selector.checkbox);
+                        let isDropdown = $element.is(selector.uiDropdown) && module.can.useElement('dropdown');
+                        let isCalendar = $calendar.length > 0 && module.can.useElement('calendar');
+                        let isFile = $field.is(selector.file);
+                        let isErrored = $fieldGroup.hasClass(className.error);
                         if (defaultValue === undefined) {
                             return;
                         }
@@ -277,14 +264,11 @@
 
                 determine: {
                     isValid: function () {
-                        var
-                            allValid = true
-                        ;
+                        let allValid = true;
                         $field.each(function (index, el) {
-                            var $el = $(el),
-                                validation = module.get.validation($el) || {},
-                                identifier = module.get.identifier(validation, $el)
-                            ;
+                            let $el = $(el);
+                            let validation = module.get.validation($el) || {};
+                            let identifier = module.get.identifier(validation, $el);
                             if (!module.validate.field(validation, identifier, true)) {
                                 allValid = false;
                             }
@@ -293,14 +277,12 @@
                         return allValid;
                     },
                     isDirty: function (e) {
-                        var formIsDirty = false;
+                        let formIsDirty = false;
 
                         $field.each(function (index, el) {
-                            var
-                                $el = $(el),
-                                isCheckbox = $el.filter(selector.checkbox).length > 0,
-                                isDirty
-                            ;
+                            let $el = $(el);
+                            let isCheckbox = $el.filter(selector.checkbox).length > 0;
+                            let isDirty;
 
                             isDirty = isCheckbox
                                 ? module.is.checkboxDirty($el)
@@ -341,9 +323,7 @@
                         return String($field.val()).trim() === '';
                     },
                     valid: function (field, showErrors) {
-                        var
-                            allValid = true
-                        ;
+                        let allValid = true;
                         if (field) {
                             module.verbose('Checking if field is valid', field);
 
@@ -366,25 +346,25 @@
                         return !dirty;
                     },
                     fieldDirty: function ($el) {
-                        var initialValue = $el.data(metadata.defaultValue);
+                        let initialValue = $el.data(metadata.defaultValue);
                         // Explicitly check for undefined/null here as value may be `false`, so ($el.data(dataInitialValue) || '') would not work
                         if (initialValue === undefined || initialValue === null) {
                             initialValue = '';
                         } else if (Array.isArray(initialValue)) {
                             initialValue = initialValue.toString();
                         }
-                        var currentValue = $el.val();
+                        let currentValue = $el.val();
                         if (currentValue === undefined || currentValue === null) {
                             currentValue = '';
                         } else if (Array.isArray(currentValue)) {
-                            // multiple select values are returned as arrays which are never equal, so do string conversion first
+                            // multiple select values are returned as arrays which are never equal, so do the string conversion first
                             currentValue = currentValue.toString();
                         }
-                        // Boolean values can be encoded as "true/false" or "True/False" depending on underlying frameworks so we need a case insensitive comparison
-                        var boolRegex = /^(true|false)$/i;
-                        var isBoolValue = boolRegex.test(initialValue) && boolRegex.test(currentValue);
+                        // Boolean values can be encoded as "true/false" or "True/False" depending on underlying frameworks, so we need a case-insensitive comparison
+                        let boolRegex = /^(true|false)$/i;
+                        let isBoolValue = boolRegex.test(initialValue) && boolRegex.test(currentValue);
                         if (isBoolValue) {
-                            var regex = new RegExp('^' + initialValue + '$', 'i');
+                            let regex = new RegExp('^' + initialValue + '$', 'i');
 
                             return !regex.test(currentValue);
                         }
@@ -392,8 +372,8 @@
                         return currentValue !== initialValue;
                     },
                     checkboxDirty: function ($el) {
-                        var initialValue = $el.data(metadata.defaultValue);
-                        var currentValue = $el.is(':checked');
+                        let initialValue = $el.data(metadata.defaultValue);
+                        let currentValue = $el.is(':checked');
 
                         return initialValue !== currentValue;
                     },
@@ -421,22 +401,19 @@
                 event: {
                     field: {
                         keydown: function (event) {
-                            var
-                                $field       = $(this),
-                                key          = event.which,
-                                isInput      = $field.is(selector.input),
-                                isCheckbox   = $field.is(selector.checkbox),
-                                isInDropdown = $field.closest(selector.uiDropdown).length > 0,
-                                keyCode      = {
-                                    enter: 13,
-                                    escape: 27,
-                                }
-                            ;
+                            let $field = $(this);
+                            let key = event.which;
+                            let isInput = $field.is(selector.input);
+                            let isCheckbox = $field.is(selector.checkbox);
+                            let isInDropdown = $field.closest(selector.uiDropdown).length > 0;
+                            let keyCode = {
+                                enter: 13,
+                                escape: 27,
+                            };
                             if (key === keyCode.escape) {
                                 module.verbose('Escape key pressed blurring field');
                                 $field[0]
-                                    .blur()
-                                ;
+                                    .blur();
                             }
                             if (!event.ctrlKey && key === keyCode.enter && isInput && !isInDropdown && !isCheckbox) {
                                 if (!keyHeldDown) {
@@ -454,11 +431,9 @@
                             event.preventDefault();
                         },
                         blur: function (event) {
-                            var
-                                $field          = $(this),
-                                validationRules = module.get.validation($field) || {},
-                                identifier      = module.get.identifier(validationRules, $field)
-                            ;
+                            let $field = $(this);
+                            let validationRules = module.get.validation($field) || {};
+                            let identifier = module.get.identifier(validationRules, $field);
                             if (settings.on === 'blur' || (!$module.hasClass(className.initial) && settings.revalidate)) {
                                 module.debug('Revalidating field', $field, validationRules);
                                 module.validate.field(validationRules, identifier);
@@ -468,11 +443,9 @@
                             }
                         },
                         change: function (event) {
-                            var
-                                $field      = $(this),
-                                validationRules = module.get.validation($field) || {},
-                                identifier = module.get.identifier(validationRules, $field)
-                            ;
+                            let $field = $(this);
+                            let validationRules = module.get.validation($field) || {};
+                            let identifier = module.get.identifier(validationRules, $field);
                             if (settings.on === 'change' || (!$module.hasClass(className.initial) && settings.revalidate)) {
                                 clearTimeout(module.timer);
                                 module.timer = setTimeout(function () {
@@ -494,7 +467,7 @@
                                 event.returnValue = settings.text.leavingMessage;
                             }
 
-                            // For olders...
+                            // For older...
                             return settings.text.leavingMessage;
                         }
                     },
@@ -522,9 +495,7 @@
                         return ['file', 'checkbox', 'radio', 'hidden'].indexOf(type) >= 0 || $input.is('select') ? 'change' : 'input';
                     },
                     fieldsFromShorthand: function (fields) {
-                        var
-                            fullFields = {}
-                        ;
+                        let fullFields = {};
                         $.each(fields, function (name, rules) {
                             if (!Array.isArray(rules) && typeof rules === 'object') {
                                 fullFields[name] = rules;
@@ -541,7 +512,7 @@
                             }
 
                             $.each(fullFields[name].rules, function (index, rule) {
-                                var ruleName = module.get.ruleName(rule);
+                                let ruleName = module.get.ruleName(rule);
                                 if (ruleName === 'empty') {
                                     module.warn('*** DEPRECATED *** : Rule "empty" for field "' + name + '" will be removed in a future version. -> Use "notEmpty" rule instead.');
                                 }
@@ -554,20 +525,18 @@
                         return validation.identifier || $el.attr('id') || $el.attr('name') || $el.data(metadata.validate);
                     },
                     prompt: function (rule, field) {
-                        var
-                            ruleName      = module.get.ruleName(rule),
-                            ancillary     = module.get.ancillaryValue(rule),
-                            $field        = module.get.field(field.identifier),
-                            value         = $field.val(),
-                            promptCheck   = rule.prompt || settings.prompt[ruleName] || settings.text.unspecifiedRule,
-                            prompt        = String(isFunction(promptCheck)
-                                ? promptCheck.call($field[0], value)
-                                : promptCheck),
-                            requiresValue = prompt.search('{value}') !== -1,
-                            requiresName  = prompt.search('{name}') !== -1,
-                            parts,
-                            suffixPrompt
-                        ;
+                        let ruleName = module.get.ruleName(rule);
+                        let ancillary = module.get.ancillaryValue(rule);
+                        let $field = module.get.field(field.identifier);
+                        let value = $field.val();
+                        let promptCheck = rule.prompt || settings.prompt[ruleName] || settings.text.unspecifiedRule;
+                        let prompt = String(isFunction(promptCheck)
+                            ? promptCheck.call($field[0], value)
+                            : promptCheck);
+                        let requiresValue = prompt.search('{value}') !== -1;
+                        let requiresName = prompt.search('{name}') !== -1;
+                        let parts;
+                        let suffixPrompt;
                         if (ancillary && ['integer', 'decimal', 'number', 'size'].indexOf(ruleName) >= 0 && ancillary.indexOf('..') >= 0) {
                             parts = ancillary.split('..', 2);
                             if (!rule.prompt && ruleName !== 'size') {
@@ -630,21 +599,20 @@
                     },
                     field: function (identifier, strict, ignoreMissing) {
                         module.verbose('Finding field with identifier', identifier);
-                        identifier = module.escape.string(identifier);
-                        var t;
-                        t = $field.filter('#' + identifier);
+                        let t;
+                        t = $field.filter('#' + CSS.escape(identifier));
                         if (t.length > 0) {
                             return t;
                         }
-                        t = $field.filter('[name="' + identifier + '"]');
+                        t = $field.filter('[name="' + CSS.escape(identifier) + '"]');
                         if (t.length > 0) {
                             return t;
                         }
-                        t = $field.filter('[name="' + identifier + '[]"]');
+                        t = $field.filter('[name="' + CSS.escape(identifier) + '[]"]');
                         if (t.length > 0) {
                             return t;
                         }
-                        t = $field.filter('[data-' + metadata.validate + '="' + identifier + '"]');
+                        t = $field.filter('[data-' + metadata.validate + '="' + CSS.escape(identifier) + '"]');
                         if (t.length > 0) {
                             return t;
                         }
@@ -655,9 +623,7 @@
                         return strict ? $() : $('<input/>');
                     },
                     fields: function (fields, strict) {
-                        var
-                            $fields = $()
-                        ;
+                        let $fields = $();
                         $.each(fields, function (index, name) {
                             $fields = $fields.add(module.get.field(name, strict));
                         });
@@ -665,21 +631,18 @@
                         return $fields;
                     },
                     fieldLabel: function (identifier, useIdAsFallback) {
-                        var $field = typeof identifier === 'string'
-                                ? module.get.field(identifier)
-                                : identifier,
-                            $label = $field.closest(selector.group).find('label:not(:empty)').eq(0)
-                        ;
+                        let $field = typeof identifier === 'string'
+                            ? module.get.field(identifier)
+                            : identifier;
+                        let $label = $field.closest(selector.group).find('label:not(:empty)').eq(0);
 
                         return $label.length === 1
                             ? $label.text()
                             : $field.prop('placeholder') || (useIdAsFallback ? identifier : settings.text.unspecifiedField);
                     },
                     validation: function ($field) {
-                        var
-                            fieldValidation,
-                            identifier
-                        ;
+                        let fieldValidation;
+                        let identifier;
                         if (!validation) {
                             return false;
                         }
@@ -698,11 +661,9 @@
                         return fieldValidation || false;
                     },
                     value: function (field, strict) {
-                        var
-                            fields = [],
-                            results,
-                            resultKeys
-                        ;
+                        let fields = [];
+                        let results;
+                        let resultKeys;
                         fields.push(field);
                         results = module.get.values.call(element, fields, strict);
                         resultKeys = Object.keys(results);
@@ -710,26 +671,22 @@
                         return resultKeys.length > 0 ? results[resultKeys[0]] : undefined;
                     },
                     values: function (fields, strict) {
-                        var
-                            $fields = Array.isArray(fields) && fields.length > 0
-                                ? module.get.fields(fields, strict)
-                                : $field,
-                            values = {}
-                        ;
+                        let $fields = Array.isArray(fields) && fields.length > 0
+                            ? module.get.fields(fields, strict)
+                            : $field;
+                        let values = {};
                         $fields.each(function (index, field) {
-                            var
-                                $field       = $(field),
-                                $calendar    = $field.closest(selector.uiCalendar),
-                                name         = $field.prop('name') || $field.prop('id'),
-                                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
-                                    ? $field.is(':checked')
-                                    : false
-                            ;
+                            let $field = $(field);
+                            let $calendar = $field.closest(selector.uiCalendar);
+                            let name = $field.prop('name') || $field.prop('id');
+                            let value = $field.val();
+                            let isCheckbox = $field.is(selector.checkbox);
+                            let isRadio = $field.is(selector.radio);
+                            let isMultiple = name.indexOf('[]') !== -1;
+                            let isCalendar = $calendar.length > 0 && module.can.useElement('calendar');
+                            let isChecked = isCheckbox
+                                ? $field.is(':checked')
+                                : false;
                             if (name) {
                                 if (isMultiple) {
                                     name = name.replace('[]', '');
@@ -755,7 +712,7 @@
                                     } else if (isCheckbox) {
                                         values[name] = isChecked ? value || true : false;
                                     } else if (isCalendar) {
-                                        var date = $calendar.calendar('get date');
+                                        let date = $calendar.calendar('get date');
 
                                         if (date !== null) {
                                             switch (settings.dateHandling) {
@@ -770,7 +727,7 @@
                                                     break;
                                                 }
                                                 case 'formatter': {
-                                                    var type = $calendar.calendar('setting', 'type');
+                                                    let type = $calendar.calendar('setting', 'type');
 
                                                     switch (type) {
                                                         case 'date': {
@@ -847,14 +804,6 @@
                     },
                 },
 
-                escape: {
-                    string: function (text) {
-                        text = String(text);
-
-                        return text.replace(regExp.escape, '\\$&');
-                    },
-                },
-
                 checkErrors: function (errors, internal) {
                     if (!errors || errors.length === 0) {
                         if (!internal) {
@@ -883,11 +832,9 @@
                                 rules: [],
                             };
                         }
-                        var
-                            newValidation = {
-                                rules: [],
-                            }
-                        ;
+                        let newValidation = {
+                            rules: [],
+                        };
                         if (module.is.shorthandRules(rules)) {
                             rules = Array.isArray(rules)
                                 ? rules
@@ -918,18 +865,15 @@
                         if (errors === false) {
                             return;
                         }
-                        var
-                            $field       = module.get.field(identifier),
-                            $fieldGroup  = $field.closest($group),
-                            $prompt      = $fieldGroup.children(selector.prompt),
-                            promptExists = $prompt.length > 0,
-                            canTransition = settings.transition && module.can.useElement('transition')
-                        ;
+                        let $field = module.get.field(identifier);
+                        let $fieldGroup = $field.closest($group);
+                        let $prompt = $fieldGroup.children(selector.prompt);
+                        let promptExists = $prompt.length > 0;
+                        let canTransition = settings.transition && module.can.useElement('transition');
                         module.verbose('Adding field error state', identifier);
                         if (!internal) {
                             $fieldGroup
-                                .addClass(className.error)
-                            ;
+                                .addClass(className.error);
                         }
                         if (settings.inline) {
                             if (promptExists) {
@@ -949,12 +893,10 @@
                                     $prompt.css('display', 'none');
                                 }
                                 $prompt
-                                    .appendTo($fieldGroup.filter('.' + className.error))
-                                ;
+                                    .appendTo($fieldGroup.filter('.' + className.error));
                             }
                             $prompt
-                                .html(settings.templates.prompt(errors))
-                            ;
+                                .html(settings.templates.prompt(errors));
                             if (!promptExists) {
                                 if (canTransition) {
                                     module.verbose('Displaying error with css transition', settings.transition);
@@ -962,8 +904,7 @@
                                 } else {
                                     module.verbose('Displaying error with fallback javascript animation');
                                     $prompt
-                                        .fadeIn(settings.duration)
-                                    ;
+                                        .fadeIn(settings.duration);
                                 }
                             }
                         } else {
@@ -977,9 +918,8 @@
                         }
                         module.debug('Adding form error messages', errors);
                         module.set.error();
-                        var customErrors = [],
-                            tempErrors
-                        ;
+                        let customErrors = [];
+                        let tempErrors;
                         if ($.isPlainObject(errors)) {
                             $.each(Object.keys(errors), function (i, id) {
                                 if (module.checkErrors(errors[id], true) !== false) {
@@ -1002,8 +942,7 @@
                         }
                         if (customErrors.length > 0) {
                             $message
-                                .html(settings.templates.error(customErrors))
-                            ;
+                                .html(settings.templates.error(customErrors));
                         }
                     },
                 },
@@ -1021,11 +960,9 @@
                         module.determine.isDirty();
                     },
                     rule: function (field, rule) {
-                        var
-                            rules = Array.isArray(rule)
-                                ? rule
-                                : [rule]
-                        ;
+                        let rules = Array.isArray(rule)
+                            ? rule
+                            : [rule];
                         if (validation[field] === undefined || !Array.isArray(validation[field].rules)) {
                             return;
                         }
@@ -1047,11 +984,9 @@
                         });
                     },
                     field: function (field) {
-                        var
-                            fields = Array.isArray(field)
-                                ? field
-                                : [field]
-                        ;
+                        let fields = Array.isArray(field)
+                            ? field
+                            : [field];
                         $.each(fields, function (index, field) {
                             module.remove.rule(field);
                         });
@@ -1071,14 +1006,11 @@
                         module.remove.field(fields);
                     },
                     prompt: function (identifier) {
-                        var
-                            $field      = module.get.field(identifier),
-                            $fieldGroup = $field.closest($group),
-                            $prompt     = $fieldGroup.children(selector.prompt)
-                        ;
+                        let $field = module.get.field(identifier);
+                        let $fieldGroup = $field.closest($group);
+                        let $prompt = $fieldGroup.children(selector.prompt);
                         $fieldGroup
-                            .removeClass(className.error)
-                        ;
+                            .removeClass(className.error);
                         if (settings.inline && $prompt.is(':visible')) {
                             module.verbose('Removing prompt for field', identifier);
                             if (settings.transition && module.can.useElement('transition')) {
@@ -1089,8 +1021,7 @@
                                 $prompt
                                     .fadeOut(settings.duration, function () {
                                         $prompt.remove();
-                                    })
-                                ;
+                                    });
                             }
                         }
                     },
@@ -1100,22 +1031,19 @@
                     success: function () {
                         $module
                             .removeClass(className.error)
-                            .addClass(className.success)
-                        ;
+                            .addClass(className.success);
                     },
                     defaults: function () {
                         $field.each(function (index, el) {
-                            var
-                                $el        = $(el),
-                                $parent    = $el.parent(),
-                                isCheckbox = $el.filter(selector.checkbox).length > 0,
-                                isDropdown = ($parent.is(selector.uiDropdown) || $el.is(selector.uiDropdown)) && module.can.useElement('dropdown'),
-                                $calendar  = $el.closest(selector.uiCalendar),
-                                isCalendar = $calendar.length > 0 && module.can.useElement('calendar'),
-                                value      = isCheckbox
-                                    ? $el.is(':checked')
-                                    : $el.val()
-                            ;
+                            let $el = $(el);
+                            let $parent = $el.parent();
+                            let isCheckbox = $el.filter(selector.checkbox).length > 0;
+                            let isDropdown = ($parent.is(selector.uiDropdown) || $el.is(selector.uiDropdown)) && module.can.useElement('dropdown');
+                            let $calendar = $el.closest(selector.uiCalendar);
+                            let isCalendar = $calendar.length > 0 && module.can.useElement('calendar');
+                            let value = isCheckbox
+                                ? $el.is(':checked')
+                                : $el.val();
                             if (isDropdown) {
                                 if ($parent.is(selector.uiDropdown)) {
                                     $parent.dropdown('save defaults');
@@ -1132,13 +1060,10 @@
                     error: function () {
                         $module
                             .removeClass(className.success)
-                            .addClass(className.error)
-                        ;
+                            .addClass(className.error);
                     },
                     value: function (field, value) {
-                        var
-                            fields = {}
-                        ;
+                        let fields = {};
                         fields[field] = value;
 
                         return module.set.values.call(element, fields);
@@ -1148,25 +1073,23 @@
                             return;
                         }
                         $.each(fields, function (key, value) {
-                            var
-                                $field      = module.get.field(key),
-                                $element    = $field.parent(),
-                                $calendar   = $field.closest(selector.uiCalendar),
-                                isFile      = $field.is(selector.file),
-                                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,
-                                $multipleField
-                            ;
+                            let $field = module.get.field(key);
+                            let $element = $field.parent();
+                            let $calendar = $field.closest(selector.uiCalendar);
+                            let isFile = $field.is(selector.file);
+                            let isMultiple = Array.isArray(value);
+                            let isCheckbox = $element.is(selector.uiCheckbox) && module.can.useElement('checkbox');
+                            let isDropdown = $element.is(selector.uiDropdown) && module.can.useElement('dropdown');
+                            let isRadio = $field.is(selector.radio) && isCheckbox;
+                            let isCalendar = $calendar.length > 0 && module.can.useElement('calendar');
+                            let fieldExists = $field.length > 0;
+                            let $multipleField;
                             if (fieldExists) {
                                 if (isMultiple && isCheckbox) {
                                     module.verbose('Selecting multiple', value, $field);
                                     $element.checkbox('uncheck');
                                     $.each(value, function (index, value) {
-                                        $multipleField = $field.filter('[value="' + value + '"]');
+                                        $multipleField = $field.filter('[value="' + CSS.escape(value) + '"]');
                                         $element = $multipleField.parent();
                                         if ($multipleField.length > 0) {
                                             $element.checkbox('check');
@@ -1174,10 +1097,9 @@
                                     });
                                 } else if (isRadio) {
                                     module.verbose('Selecting radio value', value, $field);
-                                    $field.filter('[value="' + value + '"]')
+                                    $field.filter('[value="' + CSS.escape(value) + '"]')
                                         .parent(selector.uiCheckbox)
-                                        .checkbox('check')
-                                    ;
+                                        .checkbox('check');
                                 } else if (isCheckbox) {
                                     module.verbose('Setting checkbox value', value, $element);
                                     if (value === true || value === 1 || value === 'on') {
@@ -1239,20 +1161,18 @@
                             });
                         }
                         $field.each(function (_index, el) {
-                            var
-                                $el        = $(el),
-                                $elGroup   = $el.closest($group),
-                                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),
-                                hasNotEmptyRule = validation
-                                    ? $.grep(validation.rules, function (rule) {
-                                        return ['notEmpty', 'checked', 'empty'].indexOf(rule.type) >= 0;
-                                    }).length > 0
-                                    : false,
-                                identifier = module.get.identifier(validation, $el)
-                            ;
+                            let $el = $(el);
+                            let $elGroup = $el.closest($group);
+                            let isCheckbox = $el.filter(selector.checkbox).length > 0;
+                            let isRequired = $el.prop('required') || $elGroup.hasClass(className.required) || $elGroup.parent().hasClass(className.required);
+                            let isDisabled = $el.is(':disabled') || $elGroup.hasClass(className.disabled) || $elGroup.parent().hasClass(className.disabled);
+                            let validation = module.get.validation($el);
+                            let hasNotEmptyRule = validation
+                                ? $.grep(validation.rules, function (rule) {
+                                    return ['notEmpty', 'checked', 'empty'].indexOf(rule.type) >= 0;
+                                }).length > 0
+                                : false;
+                            let identifier = module.get.identifier(validation, $el);
                             if (isRequired && !isDisabled && !hasNotEmptyRule && identifier !== undefined) {
                                 if (isCheckbox) {
                                     module.verbose("Adding 'checked' rule on field", identifier);
@@ -1277,7 +1197,7 @@
                 validate: {
 
                     form: function (event, ignoreCallbacks) {
-                        var values = module.get.values();
+                        let values = module.get.values();
 
                         // input keydown event will fire submit repeatedly by browser default
                         if (keyHeldDown) {
@@ -1308,14 +1228,12 @@
                                 event.stopImmediatePropagation();
                             }
                             if (settings.errorFocus && ignoreCallbacks !== true) {
-                                var
-                                    $focusElement,
-                                    hasTabIndex = true
-                                ;
+                                let $focusElement;
+                                let hasTabIndex = true;
                                 if (typeof settings.errorFocus === 'string') {
                                     $focusElement = $(document).find(settings.errorFocus);
                                     hasTabIndex = $focusElement.is('[tabindex]');
-                                    // to be able to focus/scroll into non input elements we need a tabindex
+                                    // to be able to focus/scroll into non-input elements, we need a tabindex
                                     if (!hasTabIndex) {
                                         $focusElement.attr('tabindex', -1);
                                     }
@@ -1349,20 +1267,18 @@
 
                             return true;
                         }
-                        var
-                            identifier    = field.identifier || fieldName,
-                            $field        = module.get.field(identifier),
-                            $fieldGroup = $field.closest($group),
-                            $dependsField = field.depends
-                                ? module.get.field(field.depends)
-                                : false,
-                            fieldValid  = true,
-                            fieldErrors = [],
-                            isDisabled = $field.filter(':not(:disabled)').length === 0 || $fieldGroup.hasClass(className.disabled) || $fieldGroup.parent().hasClass(className.disabled),
-                            validationMessage = $field[0].validationMessage,
-                            noNativeValidation = field.noNativeValidation || settings.noNativeValidation || $field.filter('[formnovalidate],[novalidate]').length > 0 || $module.filter('[novalidate]').length > 0,
-                            errorLimit
-                        ;
+                        let identifier = field.identifier || fieldName;
+                        let $field = module.get.field(identifier);
+                        let $fieldGroup = $field.closest($group);
+                        let $dependsField = field.depends
+                            ? module.get.field(field.depends)
+                            : false;
+                        let fieldValid = true;
+                        let fieldErrors = [];
+                        let isDisabled = $field.filter(':not(:disabled)').length === 0 || $fieldGroup.hasClass(className.disabled) || $fieldGroup.parent().hasClass(className.disabled);
+                        let validationMessage = $field[0].validationMessage;
+                        let noNativeValidation = field.noNativeValidation || settings.noNativeValidation || $field.filter('[formnovalidate],[novalidate]').length > 0 || $module.filter('[novalidate]').length > 0;
+                        let errorLimit;
                         if (!field.identifier) {
                             module.debug('Using field name as identifier', identifier);
                             field.identifier = identifier;
@@ -1387,10 +1303,10 @@
                             errorLimit = field.errorLimit || settings.errorLimit;
                             $.each(field.rules, function (index, rule) {
                                 if (module.has.field(identifier) && (!errorLimit || fieldErrors.length < errorLimit)) {
-                                    var invalidFields = module.validate.rule(field, rule, true) || [];
+                                    let invalidFields = module.validate.rule(field, rule, true) || [];
                                     if (invalidFields.length > 0) {
                                         module.debug('Field is invalid', identifier, rule.type);
-                                        var fieldError = module.get.prompt(rule, field);
+                                        let fieldError = module.get.prompt(rule, field);
                                         if (!settings.inline) {
                                             if (
                                                 // Always allow the first error prompt for new field identifiers
@@ -1434,25 +1350,23 @@
 
                     // takes validation rule and returns whether field passes rule
                     rule: function (field, rule, internal) {
-                        var
-                            $field       = module.get.field(field.identifier),
-                            ancillary    = module.get.ancillaryValue(rule),
-                            ruleName     = module.get.ruleName(rule),
-                            ruleFunction = settings.rules[ruleName],
-                            invalidFields = [],
-                            isCheckbox = $field.is(selector.checkbox),
-                            isValid = function (field) {
-                                var value = isCheckbox ? $(field).filter(':checked').val() : $(field).val();
-                                // cast to string avoiding encoding special values
-                                value = value === undefined || value === '' || value === null
-                                    ? ''
-                                    : ((settings.shouldTrim && rule.shouldTrim !== false) || rule.shouldTrim
-                                        ? String(value + '').trim()
-                                        : String(value + ''));
-
-                                return ruleFunction.call(field, value, ancillary, module);
-                            }
-                        ;
+                        let $field = module.get.field(field.identifier);
+                        let ancillary = module.get.ancillaryValue(rule);
+                        let ruleName = module.get.ruleName(rule);
+                        let ruleFunction = settings.rules[ruleName];
+                        let invalidFields = [];
+                        let isCheckbox = $field.is(selector.checkbox);
+                        let isValid = function (field) {
+                            let value = isCheckbox ? $(field).filter(':checked').val() : $(field).val();
+                            // cast to string avoiding encoding special values
+                            value = value === undefined || value === '' || value === null
+                                ? ''
+                                : ((settings.shouldTrim && rule.shouldTrim !== false) || rule.shouldTrim
+                                    ? String(value + '').trim()
+                                    : String(value + ''));
+
+                            return ruleFunction.call(field, value, ancillary, module);
+                        };
                         if (!isFunction(ruleFunction)) {
                             module.error(error.noRule, ruleName);
 
@@ -1526,11 +1440,9 @@
                 },
                 performance: {
                     log: function (message) {
-                        var
-                            currentTime,
-                            executionTime,
-                            previousTime
-                        ;
+                        let currentTime;
+                        let executionTime;
+                        let previousTime;
                         if (settings.performance) {
                             currentTime = Date.now();
                             previousTime = time || currentTime;
@@ -1549,10 +1461,8 @@
                         }, 500);
                     },
                     display: function () {
-                        var
-                            title = settings.name + ':',
-                            totalTime = 0
-                        ;
+                        let title = settings.name + ':';
+                        let totalTime = 0;
                         time = false;
                         clearTimeout(module.performance.timer);
                         $.each(performance, function (index, data) {
@@ -1577,19 +1487,17 @@
                     },
                 },
                 invoke: function (query, passedArguments, context) {
-                    var
-                        object = instance,
-                        maxDepth,
-                        found,
-                        response
-                    ;
+                    let object = instance;
+                    let maxDepth;
+                    let found;
+                    let response;
                     passedArguments = passedArguments || queryArguments;
                     context = context || element;
                     if (typeof query === 'string' && object !== undefined) {
                         query = query.split(/[ .]/);
                         maxDepth = query.length - 1;
                         $.each(query, function (depth, value) {
-                            var camelCaseValue = depth !== maxDepth
+                            let camelCaseValue = depth !== maxDepth
                                 ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
                                 : query;
                             if ($.isPlainObject(object[camelCaseValue]) && (depth !== maxDepth)) {
@@ -1774,9 +1682,7 @@
 
             // template that produces error message
             error: function (errors) {
-                var
-                    html = '<ul class="list">'
-                ;
+                let html = '<ul class="list">';
                 $.each(errors, function (index, value) {
                     html += '<li>' + value + '</li>';
                 });
@@ -1790,9 +1696,7 @@
                 if (errors.length === 1) {
                     return errors[0];
                 }
-                var
-                    html = '<ul class="ui list">'
-                ;
+                let html = '<ul class="ui list">';
                 $.each(errors, function (index, value) {
                     html += '<li>' + value + '</li>';
                 });
@@ -1843,11 +1747,6 @@
                 return !(value === undefined || value === '' || (Array.isArray(value) && value.length === 0));
             },
 
-            /* Deprecated */
-            empty: function (value) {
-                return $.fn.form.settings.rules.notEmpty(value);
-            },
-
             // checkbox checked
             checked: function () {
                 return $(this).filter(':checked').length > 0;
@@ -1858,7 +1757,7 @@
                 return $.fn.form.settings.regExp.email.test(value);
             },
 
-            // value is most likely url
+            // value is most likely the url
             url: function (value) {
                 return $.fn.form.settings.regExp.url.test(value);
             },
@@ -1868,10 +1767,8 @@
                 if (regExp instanceof RegExp) {
                     return value.match(regExp);
                 }
-                var
-                    regExpParts = regExp.match($.fn.form.settings.regExp.flags),
-                    flags
-                ;
+                let regExpParts = regExp.match($.fn.form.settings.regExp.flags);
+                let flags;
                 // regular expression specified as /baz/gi (flags)
                 if (regExpParts) {
                     regExp = regExpParts.length >= 2
@@ -1901,11 +1798,9 @@
                 if (!(regExp instanceof RegExp)) {
                     regExp = $.fn.form.settings.regExp.integer;
                 }
-                var
-                    min,
-                    max,
-                    parts
-                ;
+                let min;
+                let max;
+                let parts;
                 if (!range || ['', '..'].indexOf(range) !== -1) {
 
                     // do nothing
@@ -1934,7 +1829,7 @@
                 );
             },
 
-            // is valid number (with decimal)
+            // is it a valid number (with decimal)
             decimal: function (value, range) {
                 return $.fn.form.settings.rules.range(value, range, 'decimal');
             },
@@ -1944,7 +1839,7 @@
                 return $.fn.form.settings.rules.range(value, range, 'number');
             },
 
-            // is value (case insensitive)
+            // is value (case-insensitive)
             is: function (value, text) {
                 text = typeof text === 'string'
                     ? text.toLowerCase()
@@ -1961,7 +1856,7 @@
                 return value == text;
             },
 
-            // value is not another value (case insensitive)
+            // value is not another value (case-insensitive)
             not: function (value, notValue) {
                 value = typeof value === 'string'
                     ? value.toLowerCase()
@@ -1973,7 +1868,7 @@
                 return value != notValue;
             },
 
-            // value is not another value (case sensitive)
+            // value is not another value (case-sensitive)
             notExactly: function (value, notValue) {
                 return value != notValue;
             },
@@ -2031,16 +1926,16 @@
 
             // matches another field
             match: function (value, identifier, module) {
-                var matchingValue = module.get.value(identifier, true);
+                let matchingValue = module.get.value(identifier, true);
 
                 return matchingValue !== undefined
                     ? value.toString() === matchingValue.toString()
                     : false;
             },
 
-            // different than another field
+            // different from another field
             different: function (value, identifier, module) {
-                var matchingValue = module.get.value(identifier, true);
+                let matchingValue = module.get.value(identifier, true);
 
                 return matchingValue !== undefined
                     ? value.toString() !== matchingValue.toString()
@@ -2048,57 +1943,55 @@
             },
 
             creditCard: function (cardNumber, cardTypes) {
-                var
-                    cards = {
-                        visa: {
-                            pattern: /^4/,
-                            length: [16],
-                        },
-                        amex: {
-                            pattern: /^3[47]/,
-                            length: [15],
-                        },
-                        mastercard: {
-                            pattern: /^5[1-5]/,
-                            length: [16],
-                        },
-                        discover: {
-                            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: {
-                            pattern: /^(62|88)/,
-                            length: [16, 17, 18, 19],
-                        },
-                        jcb: {
-                            pattern: /^35(2[89]|[3-8]\d)/,
-                            length: [16],
-                        },
-                        maestro: {
-                            pattern: /^(5018|5020|5038|6304|6759|676[1-3])/,
-                            length: [12, 13, 14, 15, 16, 17, 18, 19],
-                        },
-                        dinersClub: {
-                            pattern: /^(30[0-5]|^36)/,
-                            length: [14],
-                        },
-                        laser: {
-                            pattern: /^(6304|670[69]|6771)/,
-                            length: [16, 17, 18, 19],
-                        },
-                        visaElectron: {
-                            pattern: /^(4026|417500|4508|4844|491(3|7))/,
-                            length: [16],
-                        },
+                let cards = {
+                    visa: {
+                        pattern: /^4/,
+                        length: [16],
+                    },
+                    amex: {
+                        pattern: /^3[47]/,
+                        length: [15],
+                    },
+                    mastercard: {
+                        pattern: /^5[1-5]/,
+                        length: [16],
                     },
-                    valid         = {},
-                    validCard     = false,
-                    requiredTypes = typeof cardTypes === 'string'
-                        ? cardTypes.split(',')
-                        : false,
-                    unionPay,
-                    validation
-                ;
+                    discover: {
+                        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: {
+                        pattern: /^(62|88)/,
+                        length: [16, 17, 18, 19],
+                    },
+                    jcb: {
+                        pattern: /^35(2[89]|[3-8]\d)/,
+                        length: [16],
+                    },
+                    maestro: {
+                        pattern: /^(5018|5020|5038|6304|6759|676[1-3])/,
+                        length: [12, 13, 14, 15, 16, 17, 18, 19],
+                    },
+                    dinersClub: {
+                        pattern: /^(30[0-5]|^36)/,
+                        length: [14],
+                    },
+                    laser: {
+                        pattern: /^(6304|670[69]|6771)/,
+                        length: [16, 17, 18, 19],
+                    },
+                    visaElectron: {
+                        pattern: /^(4026|417500|4508|4844|491(3|7))/,
+                        length: [16],
+                    },
+                };
+                let valid = {};
+                let validCard = false;
+                let requiredTypes = typeof cardTypes === 'string'
+                    ? cardTypes.split(',')
+                    : false;
+                let unionPay;
+                let validation;
 
                 if (typeof cardNumber !== 'string' || cardNumber.length === 0) {
                     return;
@@ -2138,15 +2031,13 @@
                 }
 
                 // verify luhn, adapted from  <https://gist.github.com/2134376>
-                var
-                    length        = cardNumber.length,
-                    multiple      = 0,
-                    producedValue = [
-                        [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
-                        [0, 2, 4, 6, 8, 1, 3, 5, 7, 9],
-                    ],
-                    sum           = 0
-                ;
+                let length = cardNumber.length;
+                let multiple = 0;
+                let producedValue = [
+                    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+                    [0, 2, 4, 6, 8, 1, 3, 5, 7, 9],
+                ];
+                let sum = 0;
                 while (length--) {
                     sum += producedValue[multiple][parseInt(cardNumber.charAt(length), 10)];
                     multiple ^= 1; // eslint-disable-line no-bitwise