formvalidation-rails 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88e0a6b3ad367af0794b86fedf6795621ebb8256
-  data.tar.gz: a84f6403ddec221611339e2497ec1ff3ab0956a6
+  metadata.gz: 508aa888c54567ee1fd53cc373fbc8f262d4e010
+  data.tar.gz: 7069f66c31732f68cf2654189eedc3c0502b18be
 SHA512:
-  metadata.gz: 6dcc345f95be570d2ae9be05bb2a0b960e7cf622088bc2014c0b489084c846e78d6c13f518b6913e57c5398c76e79b999825a4deaf2701e772c8ae55297e2c96
-  data.tar.gz: f41b339002088b6045eabe200e809382bbeeeffc934f1748ecfb7cd6a3fdbe8a238c0ed3c39c58e6355eea3cf468c023e0f3b120c93e97c46648e4ccc33a2163
+  metadata.gz: 64da37953d0636a8648bbb1ed5a2fee7747112c0e88347a908c15393165fc65c13b3b9480c96141301f89d238b37a148d4f1f12e0bf387d4cc49be307507b4a9
+  data.tar.gz: 6e476090b60cdb2320d86e1cac3f998f1e74b837702c10bdd07c5e3b110249113565c948c4c91e577831a9d0fb63b959ed4740369da29512cea00b53319bc2c3

data/README.md

@@ -1,4 +1,4 @@
-formvalidation-rails (0.6.3)
+formvalidation-rails (0.7.0)
 =================================
 
 Provides client side validations for forms with the http://formvalidation.io/ library.
@@ -6,6 +6,11 @@ Provides client side validations for forms with the http://formvalidation.io/ li
 The original formvalidation repo can be found here: https://github.com/formvalidation/formvalidation.
 This is only a gem containing a release version for easier use.
 
+### Important
+
+For commercial use a commercial license for formvalidation.io needs to be purchased at http://formvalidation.io/.
+This gem only provides a package for easier use with RubyOnRails but does not affect the original license of
+formvalidation.io.
 
 ### How to Use
 
@@ -37,11 +42,6 @@ And if needed the extension (for html frameworks) and language packs you need:
 `*= require formvalidation.min`
 
 
-### License
-
-**Important** for commercial use a commercial license for formvalidation.io needs to be purchased at http://formvalidation.io/
-
-
 ### Credits
 
 This gem was build after the example of https://rubygems.org/gems/bootstrap-validator-rails, a earlier version of formvalidation.io under a different name.

data/lib/formvalidation-rails/version.rb

@@ -1,6 +1,6 @@
 module FormvalidationRails
   module Rails
-    VERSION = '0.6.3'
-    SOURCE_VERSION = '0.6.3'
+    VERSION = '0.7.0'
+    SOURCE_VERSION = '0.7.0'
   end
 end

data/vendor/assets/javascripts/formvalidation.js

@@ -2,8 +2,8 @@
  * FormValidation (http://formvalidation.io)
  * The best jQuery plugin to validate form fields. Support Bootstrap, Foundation, Pure, SemanticUI, UIKit and custom frameworks
  *
- * @version     v0.6.2-dev, built on 2015-03-13 8:15:45 AM
- * @author      https://twitter.com/nghuuphuoc
+ * @version     v0.7.0, built on 2015-08-01 4:57:16 PM
+ * @author      https://twitter.com/formvalidation
  * @copyright   (c) 2013 - 2015 Nguyen Huu Phuoc
  * @license     http://formvalidation.io/license/
  */
@@ -27,7 +27,7 @@ if (typeof jQuery === 'undefined') {
 }(jQuery));
 
 (function($) {
-    // TODO: Remove backward compatibility in v0.7.0
+    // TODO: Remove backward compatibility
     /**
      * Constructor
      *
@@ -53,19 +53,22 @@ if (typeof jQuery === 'undefined') {
         this.STATUS_VALID         = 'VALID';
         this.STATUS_IGNORED       = 'IGNORED';
 
+        // Default message
+        this.DEFAULT_MESSAGE      = $.fn.formValidation.DEFAULT_MESSAGE;
+
         // Determine the event that is fired when user change the field value
         // Most modern browsers supports input event except IE 7, 8.
         // IE 9 supports input event but the event is still not fired if I press the backspace key.
         // Get IE version
         // https://gist.github.com/padolsey/527683/#comment-7595
-        var ieVersion = (function() {
+        this._ieVersion = (function() {
             var v = 3, div = document.createElement('div'), a = div.all || [];
             while (div.innerHTML = '<!--[if gt IE '+(++v)+']><br><![endif]-->', a[0]) {}
-            return v > 4 ? v : !v;
+            return v > 4 ? v : document.documentMode;
         }());
 
         var el = document.createElement('div');
-        this._changeEvent = (ieVersion === 9 || !('oninput' in el)) ? 'keyup' : 'input';
+        this._changeEvent = (this._ieVersion === 9 || !('oninput' in el)) ? 'keyup' : 'input';
 
         // The flag to indicate that the form is ready to submit when a remote/callback validator returns
         this._submitIfValid = null;
@@ -120,6 +123,7 @@ if (typeof jQuery === 'undefined') {
                     },
                     events: {
                         formInit:         this.$form.attr('data-' + ns + '-events-form-init'),
+                        formPreValidate:  this.$form.attr('data-' + ns + '-events-form-prevalidate'),
                         formError:        this.$form.attr('data-' + ns + '-events-form-error'),
                         formSuccess:      this.$form.attr('data-' + ns + '-events-form-success'),
                         fieldAdded:       this.$form.attr('data-' + ns + '-events-field-added'),
@@ -143,6 +147,7 @@ if (typeof jQuery === 'undefined') {
                     live:          this.$form.attr('data-' + ns + '-live'),
                     locale:        this.$form.attr('data-' + ns + '-locale'),
                     message:       this.$form.attr('data-' + ns + '-message'),
+                    onPreValidate: this.$form.attr('data-' + ns + '-onprevalidate'),
                     onError:       this.$form.attr('data-' + ns + '-onerror'),
                     onSuccess:     this.$form.attr('data-' + ns + '-onsuccess'),
                     row: {
@@ -176,7 +181,7 @@ if (typeof jQuery === 'undefined') {
                 // Find all fields which have either "name" or "data-{namespace}-field" attribute
                 this.$form
                     .find('[name], [data-' + ns + '-field]')
-                    .each(function () {
+                    .each(function() {
                         var $field = $(this),
                             field  = $field.attr('name') || $field.attr('data-' + ns + '-field'),
                             opts   = that._parseOptions($field);
@@ -239,8 +244,8 @@ if (typeof jQuery === 'undefined') {
                             // The button might contain HTML tag
                             $button = $target.is('[type="submit"]') ? $target.eq(0) : $target.parent('[type="submit"]').eq(0);
 
-                        // Don't perform validation when clicking on the submit button/input
-                        // which aren't defined by the 'button.selector' option
+                        // Don't perform validation when clicking on the submit button/input which
+                        // aren't defined by the 'button.selector' option
                         if (that.options.button.selector && !$button.is(that.options.button.selector) && !$button.is(that.$hiddenButton)) {
                             that.$form.off('submit.' + that._namespace).submit();
                         }
@@ -265,6 +270,11 @@ if (typeof jQuery === 'undefined') {
             });
 
             // Prepare the events
+            if (this.options.onPreValidate) {
+                this.$form.on(this.options.events.formPreValidate, function(e) {
+                    FormValidation.Helper.call(that.options.onPreValidate, [e]);
+                });
+            }
             if (this.options.onSuccess) {
                 this.$form.on(this.options.events.formSuccess, function(e) {
                     FormValidation.Helper.call(that.options.onSuccess, [e]);
@@ -307,9 +317,12 @@ if (typeof jQuery === 'undefined') {
                 return;
             }
 
-            var validatorName;
-            for (validatorName in this.options.fields[field].validators) {
-                if (!FormValidation.Validator[validatorName]) {
+            var validators = this.options.fields[field].validators,
+                validatorName,
+                alias;
+            for (validatorName in validators) {
+                alias = validators[validatorName].alias || validatorName;
+                if (!FormValidation.Validator[alias]) {
                     delete this.options.fields[field].validators[validatorName];
                 }
             }
@@ -352,7 +365,7 @@ if (typeof jQuery === 'undefined') {
 
                 // Create help block elements for showing the error messages
                 $field.data(ns + '.messages', $message);
-                for (validatorName in this.options.fields[field].validators) {
+                for (validatorName in validators) {
                     $field.data(ns + '.result.' + validatorName, this.STATUS_NOT_VALIDATED);
 
                     if (!updateAll || i === total - 1) {
@@ -367,8 +380,9 @@ if (typeof jQuery === 'undefined') {
                     }
 
                     // Init the validator
-                    if ('function' === typeof FormValidation.Validator[validatorName].init) {
-                        FormValidation.Validator[validatorName].init(this, $field, this.options.fields[field].validators[validatorName]);
+                    alias = validators[validatorName].alias || validatorName;
+                    if ('function' === typeof FormValidation.Validator[alias].init) {
+                        FormValidation.Validator[alias].init(this, $field, this.options.fields[field].validators[validatorName], validatorName);
                     }
                 }
 
@@ -403,12 +417,12 @@ if (typeof jQuery === 'undefined') {
                             // Show tooltip/popover message when field gets focus
                             .off('focus.container.' + ns)
                             .on('focus.container.' + ns, function() {
-                                that._showTooltip($field, container);
+                                that._showTooltip($(this), container);
                             })
                             // and hide them when losing focus
                             .off('blur.container.' + ns)
                             .on('blur.container.' + ns, function() {
-                                that._hideTooltip($field, container);
+                                that._hideTooltip($(this), container);
                             });
                     }
 
@@ -446,6 +460,12 @@ if (typeof jQuery === 'undefined') {
                         FormValidation.Helper.call(onError, [e, data]);
                     }
                 })
+                .on(this.options.events.validatorIgnored, function(e, data) {
+                    var onIgnored = that.getOptions(data.field, data.validator, 'onIgnored');
+                    if (onIgnored) {
+                        FormValidation.Helper.call(onIgnored, [e, data]);
+                    }
+                })
                 .on(this.options.events.validatorSuccess, function(e, data) {
                     var onSuccess = that.getOptions(data.field, data.validator, 'onSuccess');
                     if (onSuccess) {
@@ -534,9 +554,13 @@ if (typeof jQuery === 'undefined') {
                 return trigger;
             }
 
+            // IE10/11 auto fires input event of elements using the placeholder attribute
+            // https://connect.microsoft.com/IE/feedback/details/856700/
             var type  = $field.attr('type'),
                 name  = $field.attr('data-' + ns + '-field'),
-                event = ('radio' === type || 'checkbox' === type || 'file' === type || 'SELECT' === $field.get(0).tagName) ? 'change' : this._changeEvent;
+                event = ('radio' === type || 'checkbox' === type || 'file' === type || 'SELECT' === $field.get(0).tagName)
+                        ? 'change'
+                        : (this._ieVersion >= 10 && $field.attr('placeholder') ? 'keyup' : this._changeEvent);
             trigger   = ((this.options.fields[name] ? this.options.fields[name].trigger : null) || this.options.trigger || event).split(' ');
 
             // Since the trigger data is used many times, I need to cache it to use later
@@ -553,21 +577,26 @@ if (typeof jQuery === 'undefined') {
          * @returns {String}
          */
         _getMessage: function(field, validatorName) {
-            if (!this.options.fields[field] || !FormValidation.Validator[validatorName]
-                || !this.options.fields[field].validators || !this.options.fields[field].validators[validatorName])
-            {
+            if (!this.options.fields[field] || !this.options.fields[field].validators) {
+                return '';
+            }
+            var validators = this.options.fields[field].validators,
+                alias      = (validators[validatorName] && validators[validatorName].alias) ? validators[validatorName].alias : validatorName;
+            if (!FormValidation.Validator[alias]) {
                 return '';
             }
 
             switch (true) {
-                case !!this.options.fields[field].validators[validatorName].message:
-                    return this.options.fields[field].validators[validatorName].message;
+                case !!validators[validatorName].message:
+                    return validators[validatorName].message;
                 case !!this.options.fields[field].message:
                     return this.options.fields[field].message;
-                case (!!FormValidation.I18n[this.options.locale] && !!FormValidation.I18n[this.options.locale][validatorName] && !!FormValidation.I18n[this.options.locale][validatorName]['default']):
-                    return FormValidation.I18n[this.options.locale][validatorName]['default'];
-                default:
+                case !!this.options.message:
                     return this.options.message;
+                case (!!FormValidation.I18n[this.options.locale] && !!FormValidation.I18n[this.options.locale][alias] && !!FormValidation.I18n[this.options.locale][alias]['default']):
+                    return FormValidation.I18n[this.options.locale][alias]['default'];
+                default:
+                    return this.DEFAULT_MESSAGE;
             }
         },
 
@@ -649,9 +678,11 @@ if (typeof jQuery === 'undefined') {
          * @returns {Object}
          */
         _parseOptions: function($field) {
-            var ns         = this._namespace,
-                field      = $field.attr('name') || $field.attr('data-' + ns + '-field'),
-                validators = {},
+            var ns           = this._namespace,
+                field        = $field.attr('name') || $field.attr('data-' + ns + '-field'),
+                validators   = {},
+                aliasAttr    = new RegExp('^data-' + ns + '-([a-z]+)-alias$'),
+                validatorSet = $.extend({}, FormValidation.Validator),
                 validator,
                 v,          // Validator name
                 attrName,
@@ -662,8 +693,19 @@ if (typeof jQuery === 'undefined') {
                 html5AttrName,
                 html5AttrMap;
 
-            for (v in FormValidation.Validator) {
-                validator    = FormValidation.Validator[v];
+            // Determine whether the alias validator is used by checking the data-fv-validator-alias attribute
+            $.each($field.get(0).attributes, function(i, attribute) {
+                if (attribute.value && aliasAttr.test(attribute.name)) {
+                    v = attribute.name.split('-')[2];
+                    if (validatorSet[attribute.value]) {
+                        validatorSet[v]       = validatorSet[attribute.value];
+                        validatorSet[v].alias = attribute.value;
+                    }
+                }
+            });
+
+            for (v in validatorSet) {
+                validator    = validatorSet[v];
                 attrName     = 'data-' + ns + '-' + v.toLowerCase(),
                 enabled      = $field.attr(attrName) + '';
                 html5AttrMap = ('function' === typeof validator.enableByHtml5) ? validator.enableByHtml5($field) : null;
@@ -679,11 +721,14 @@ if (typeof jQuery === 'undefined') {
                                                     transformer: 'transformer'
                                                 }, validator.html5Attributes);
                     validators[v] = $.extend({}, html5AttrMap === true ? {} : html5AttrMap, validators[v]);
+                    if (validator.alias) {
+                        validators[v].alias = validator.alias;
+                    }
 
                     for (html5AttrName in validator.html5Attributes) {
-                        optionName  = validator.html5Attributes[html5AttrName];
-                        optionAttrName = 'data-' + ns + '-' + v.toLowerCase() + '-' + html5AttrName,
-                        optionValue = $field.attr(optionAttrName);
+                        optionName     = validator.html5Attributes[html5AttrName];
+                        optionAttrName = 'data-' + ns + '-' + v.toLowerCase() + '-' + html5AttrName;
+                        optionValue    = $field.attr(optionAttrName);
                         if (optionValue) {
                             if ('true' === optionValue || optionAttrName === optionValue.toLowerCase()) {
                                 optionValue = true;
@@ -699,6 +744,7 @@ if (typeof jQuery === 'undefined') {
             var opts = {
                     autoFocus:   $field.attr('data-' + ns + '-autofocus'),
                     err:         $field.attr('data-' + ns + '-err-container') || $field.attr('data-' + ns + '-container'), // Support backward
+                    enabled:     $field.attr('data-' + ns + '-enabled'),
                     excluded:    $field.attr('data-' + ns + '-excluded'),
                     icon:        $field.attr('data-' + ns + '-icon') || $field.attr('data-' + ns + '-feedbackicons') || (this.options.fields && this.options.fields[field] ? this.options.fields[field].feedbackIcons : null), // Support backward
                     message:     $field.attr('data-' + ns + '-message'),
@@ -717,7 +763,7 @@ if (typeof jQuery === 'undefined') {
                 emptyValidators = $.isEmptyObject(validators);  // Check if the field validators are set using HTML attributes
 
             if (!emptyValidators || (!emptyOptions && this.options.fields && this.options.fields[field])) {
-                opts.validators = validators;
+                //opts.validators = validators;
                 return opts;
             } else {
                 return null;
@@ -1161,6 +1207,12 @@ if (typeof jQuery === 'undefined') {
                     $errors = $f.data(ns + '.messages')
                                 .find('.' + this.options.err.clazz.split(' ').join('.') + '[data-' + ns + '-validator][data-' + ns + '-for="' + field + '"]');
 
+                if (this.options.fields && this.options.fields[field]
+                    && (this.options.fields[field].enabled === 'false' || this.options.fields[field].enabled === false))
+                {
+                    continue;
+                }
+
                 if ($errors.filter('[data-' + ns + '-result="' + this.STATUS_INVALID + '"]').length > 0) {
                     return false;
                 }
@@ -1199,7 +1251,9 @@ if (typeof jQuery === 'undefined') {
                 default:
                     break;
             }
-            if (fields.length === 0 || !this.options.fields[field] || this.options.fields[field].enabled === false) {
+            if (fields.length === 0 || !this.options.fields[field]
+                || this.options.fields[field].enabled === 'false' || this.options.fields[field].enabled === false)
+            {
                 return true;
             }
 
@@ -1411,16 +1465,18 @@ if (typeof jQuery === 'undefined') {
                         }
                         break;
 
-                    case this.STATUS_VALID:
                     case this.STATUS_IGNORED:       // Treat ignored fields like they are valid with some specialties
+                    case this.STATUS_VALID:
                         isValidating   = ($allErrors.filter('[data-' + ns + '-result="' + this.STATUS_VALIDATING +'"]').length > 0);
                         isNotValidated = ($allErrors.filter('[data-' + ns + '-result="' + this.STATUS_NOT_VALIDATED +'"]').length > 0);
 
+                        var numIgnored = $allErrors.filter('[data-' + ns + '-result="' + this.STATUS_IGNORED +'"]').length;
+
                         // If the field is valid (passes all validators)
                         isValidField   = (isValidating || isNotValidated)     // There are some validators that have not done
-                                       ? null
-                                       : ($allErrors.filter('[data-' + ns + '-result="' + this.STATUS_VALID +'"]').length
-                                        + $allErrors.filter('[data-' + ns + '-result="' + this.STATUS_IGNORED +'"]').length === $allErrors.length); // All validators are completed
+                                        ? null
+                                        // All validators are completed
+                                        : ($allErrors.filter('[data-' + ns + '-result="' + this.STATUS_VALID +'"]').length + numIgnored === $allErrors.length);
 
                         $field.removeClass(this.options.control.valid).removeClass(this.options.control.invalid);
 
@@ -1438,9 +1494,10 @@ if (typeof jQuery === 'undefined') {
 
                         if ($icon) {
                             $icon.removeClass(this.options.icon.invalid).removeClass(this.options.icon.validating).removeClass(this.options.icon.valid);
-                            if (status === this.STATUS_VALID) {
-                                $icon.addClass(isValidField === null
-                                        ? '' : (isValidField ? this.options.icon.valid : (isValidating ? this.options.icon.validating : this.options.icon.invalid)))
+                            if (status === this.STATUS_VALID || numIgnored !== $allErrors.length) {
+                                $icon.addClass(isValidating
+                                                ? this.options.icon.validating
+                                                : (isValidField === null ? '' : (isValidField ? this.options.icon.valid : this.options.icon.invalid)))
                                      .show();
                             }
                         }
@@ -1448,8 +1505,7 @@ if (typeof jQuery === 'undefined') {
                         var isValidContainer = this.isValidContainer($parent);
                         if (isValidContainer !== null) {
                             $parent.removeClass(this.options.row.valid).removeClass(this.options.row.invalid);
-
-                            if (status === this.STATUS_VALID || $allErrors.length > 1) {
+                            if (status === this.STATUS_VALID || numIgnored !== $allErrors.length) {
                                 $parent.addClass(isValidContainer ? this.options.row.valid : this.options.row.invalid);
                             }
                         }
@@ -1501,8 +1557,9 @@ if (typeof jQuery === 'undefined') {
                 this._submit();
                 return this;
             }
-            this.disableSubmitButtons(true);
+            this.$form.trigger($.Event(this.options.events.formPreValidate));
 
+            this.disableSubmitButtons(true);
             this._submitIfValid = false;
             for (var field in this.options.fields) {
                 this.validateField(field);
@@ -1535,7 +1592,9 @@ if (typeof jQuery === 'undefined') {
                     break;
             }
 
-            if (fields.length === 0 || !this.options.fields[field] || this.options.fields[field].enabled === false) {
+            if (fields.length === 0 || !this.options.fields[field]
+                || this.options.fields[field].enabled === 'false' || this.options.fields[field].enabled === false)
+            {
                 return this;
             }
 
@@ -1546,6 +1605,7 @@ if (typeof jQuery === 'undefined') {
                 validators = this.options.fields[field].validators,
                 verbose    = this.isOptionEnabled(field, 'verbose'),
                 validatorName,
+                alias,
                 validateResult;
 
             for (var i = 0; i < total; i++) {
@@ -1569,12 +1629,18 @@ if (typeof jQuery === 'undefined') {
                         this._onFieldValidated($field, validatorName);
                         continue;
                     } else if (validators[validatorName].enabled === false) {
-                        this.updateStatus(updateAll ? field : $field, this.STATUS_VALID, validatorName);
+                        // Changed in v0.6.2:
+                        // When the field validator is disabled, it should be treated as STATUS_IGNORED instead of STATUS_VALID
+                        // By doing that, the field with only disabled and ignored validators will not have success/error class
+                        this.updateStatus(updateAll ? field : $field, this.STATUS_IGNORED, validatorName);
                         continue;
                     }
 
                     $field.data(ns + '.result.' + validatorName, this.STATUS_VALIDATING);
-                    validateResult = FormValidation.Validator[validatorName].validate(this, $field, validators[validatorName]);
+
+                    // Check whether or not the validator is just an alias of another
+                    alias          = validators[validatorName].alias || validatorName;
+                    validateResult = FormValidation.Validator[alias].validate(this, $field, validators[validatorName], validatorName);
 
                     // validateResult can be a $.Deferred object ...
                     if ('object' === typeof validateResult && validateResult.resolve) {
@@ -1621,9 +1687,9 @@ if (typeof jQuery === 'undefined') {
                             break;
                         }
                     }
-                    // ... or null/undefined
-                    // to indicate that the field should be ignored for current validation
-                    else if (null === validateResult || undefined === validateResult) {
+                    // ... or null
+                    // to indicate that the field should be ignored for current validator
+                    else if (null === validateResult) {
                         $field.data(ns + '.response.' + validatorName, validateResult);
                         this.updateStatus(updateAll ? field : $field, this.STATUS_IGNORED, validatorName);
                     }
@@ -1697,7 +1763,7 @@ if (typeof jQuery === 'undefined') {
          * It will remove all error messages, feedback icons and turn off the events
          */
         destroy: function() {
-            var ns = this._namespace, i, field, fields, $field, validator, $icon, row;
+            var ns = this._namespace, i, field, fields, $field, validator, $icon, row, alias;
 
             // Destroy the validators first
             for (field in this.options.fields) {
@@ -1713,8 +1779,9 @@ if (typeof jQuery === 'undefined') {
                               .removeData(ns + '.dfs.' + validator);
 
                         // Destroy the validator
-                        if ('function' === typeof FormValidation.Validator[validator].destroy) {
-                            FormValidation.Validator[validator].destroy(this, $field, this.options.fields[field].validators[validator]);
+                        alias = this.options.fields[field].validators[validator].alias || validator;
+                        if ('function' === typeof FormValidation.Validator[alias].destroy) {
+                            FormValidation.Validator[alias].destroy(this, $field, this.options.fields[field].validators[validator], validator);
                         }
                     }
                 }
@@ -2173,8 +2240,10 @@ if (typeof jQuery === 'undefined') {
 
     $.fn.formValidation.Constructor = FormValidation.Base;
 
-    // The default options
-    // Sorted in alphabetical order
+    // Default message
+    $.fn.formValidation.DEFAULT_MESSAGE = 'This value is not valid';
+
+    // The default options sorted in alphabetical order
     $.fn.formValidation.DEFAULT_OPTIONS = {
         // The first invalid field will be focused automatically
         autoFocus: true,
@@ -2191,6 +2260,7 @@ if (typeof jQuery === 'undefined') {
         events: {
             // Support backward
             formInit: 'init.form.fv',
+            formPreValidate: 'prevalidate.form.fv',
             formError: 'err.form.fv',
             formSuccess: 'success.form.fv',
             fieldAdded: 'added.field.fv',
@@ -2244,7 +2314,7 @@ if (typeof jQuery === 'undefined') {
         locale: 'en_US',
 
         // Default invalid message
-        message: 'This value is not valid',
+        message: null,
 
         // The field will not be live validated if its length is less than this number of characters
         threshold: null,
@@ -2264,7 +2334,8 @@ if (typeof jQuery === 'undefined') {
         button: {
             // The submit buttons selector
             // These buttons will be disabled to prevent the valid form from multiple submissions
-            selector: '[type="submit"]',
+            // Don't perform validation when clicking on the submit button/input which have formnovalidate attribute
+            selector: '[type="submit"]:not([formnovalidate])',
 
             // The disabled class
             disabled: ''
@@ -2489,8 +2560,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'base64');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -2547,16 +2618,13 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'between');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
 
 			value = this._format(value);
-            if (!$.isNumeric(value)) {
-                return false;
-            }
 
             var locale   = validator.getLocale(),
                 min      = $.isNumeric(options.min) ? options.min : validator.getDynamicOption($field, options.min),
@@ -2564,14 +2632,13 @@ if (typeof jQuery === 'undefined') {
                 minValue = this._format(min),
                 maxValue = this._format(max);
 
-            value = parseFloat(value);
 			return (options.inclusive === true || options.inclusive === undefined)
                     ? {
-                        valid: value >= minValue && value <= maxValue,
+                        valid: $.isNumeric(value) && parseFloat(value) >= minValue && parseFloat(value) <= maxValue,
                         message: FormValidation.Helper.format(options.message || FormValidation.I18n[locale].between['default'], [min, max])
                     }
                     : {
-                        valid: value > minValue  && value <  maxValue,
+                        valid: $.isNumeric(value) && parseFloat(value) > minValue && parseFloat(value) < maxValue,
                         message: FormValidation.Helper.format(options.message || FormValidation.I18n[locale].between.notInclusive, [min, max])
                     };
         },
@@ -2603,8 +2670,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'bic');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -2625,18 +2692,16 @@ if (typeof jQuery === 'undefined') {
          *     validation and an associated message.
          * (4) ajax 400 call handler does the following:
          *
-         *      bv.updateMessage(field, 'blank', errorMessage);
-         *      bv.updateStatus(field, 'INVALID');
+         *      fv.updateMessage(field, 'blank', errorMessage);
+         *      fv.updateStatus(field, 'INVALID', 'blank');
          *
-         * @see https://github.com/formvalidation/formvalidation/issues/542
-         * @see https://github.com/formvalidation/formvalidation/pull/666
          * @param {FormValidation.Base} validator The validator plugin instance
          * @param {jQuery} $field Field element
          * @param {Object} options Can consist of the following keys:
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
+        validate: function(validator, $field, options, validatorName) {
             return true;
         }
     };
@@ -2662,17 +2727,17 @@ if (typeof jQuery === 'undefined') {
          * @param {FormValidation.Base} validator The validator plugin instance
          * @param {jQuery} $field Field element
          * @param {Object} options Can consist of the following keys:
-         * - callback: The callback method that passes 2 parameters:
+         * - callback: The callback method that passes parameters:
          *      callback: function(fieldValue, validator, $field) {
          *          // fieldValue is the value of field
-         *          // validator is instance of BootstrapValidator
+         *          // validator is instance of FormValidation.Base
          *          // $field is the field element
          *      }
          * - message: The invalid message
          * @returns {Deferred}
          */
-        validate: function(validator, $field, options) {
-            var value  = validator.getFieldValue($field, 'callback'),
+        validate: function(validator, $field, options, validatorName) {
+            var value  = validator.getFieldValue($field, validatorName),
                 dfd    = new $.Deferred(),
                 result = { valid: true };
 
@@ -2681,7 +2746,7 @@ if (typeof jQuery === 'undefined') {
                 result = ('boolean' === typeof response || null === response) ? { valid: response } : response;
             }
 
-            dfd.resolve($field, 'callback', result);
+            dfd.resolve($field, validatorName, result);
             return dfd;
         }
     };
@@ -2724,7 +2789,7 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Object}
          */
-        validate: function(validator, $field, options) {
+        validate: function(validator, $field, options, validatorName) {
             var locale     = validator.getLocale(),
                 ns         = validator.getNamespace(),
                 numChoices = $field.is('select')
@@ -2846,8 +2911,8 @@ if (typeof jQuery === 'undefined') {
          * - type: The array of valid color types
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'color');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -2928,8 +2993,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'creditCard');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -3030,9 +3095,6 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.cusip = {
         /**
          * Validate a CUSIP number
-         * Examples:
-         * - Valid: 037833100, 931142103, 14149YAR8, 126650BG6
-         * - Invalid: 31430F200, 022615AC2
          *
          * @see http://en.wikipedia.org/wiki/CUSIP
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -3041,8 +3103,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'cusip');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -3100,11 +3162,11 @@ if (typeof jQuery === 'undefined') {
          * @param {Object} options Consists of the following key:
          * - creditCardField: The credit card number field
          */
-        init: function(validator, $field, options) {
+        init: function(validator, $field, options, validatorName) {
             if (options.creditCardField) {
                 var creditCardField = validator.getFieldElements(options.creditCardField);
-                validator.onLiveChange(creditCardField, 'live_cvv', function() {
-                    var status = validator.getStatus($field, 'cvv');
+                validator.onLiveChange(creditCardField, 'live_' + validatorName, function() {
+                    var status = validator.getStatus($field, validatorName);
                     if (status !== validator.STATUS_NOT_VALIDATED) {
                         validator.revalidateField($field);
                     }
@@ -3120,10 +3182,10 @@ if (typeof jQuery === 'undefined') {
          * @param {Object} options Consists of the following key:
          * - creditCardField: The credit card number field
          */
-        destroy: function(validator, $field, options) {
+        destroy: function(validator, $field, options, validatorName) {
             if (options.creditCardField) {
                 var creditCardField = validator.getFieldElements(options.creditCardField);
-                validator.offLiveChange(creditCardField, 'live_cvv');
+                validator.offLiveChange(creditCardField, 'live_' + validatorName);
             }
         },
 
@@ -3137,8 +3199,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'cvv');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -3156,7 +3218,7 @@ if (typeof jQuery === 'undefined') {
             if (creditCard === '') {
                 return true;
             }
-
+            
             creditCard = creditCard.replace(/\D/g, '');
 
             // Supported credit card types
@@ -3273,8 +3335,8 @@ if (typeof jQuery === 'undefined') {
          * ii) date, time and A (indicating AM or PM)
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'date');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -3466,6 +3528,7 @@ if (typeof jQuery === 'undefined') {
 
             return {
                 valid: valid,
+                date: date,
                 message: message
             };
         },
@@ -3614,12 +3677,12 @@ if (typeof jQuery === 'undefined') {
          * @param {Object} options Consists of the following key:
          * - field: The name of field that will be used to compare with current one
          */
-        init: function(validator, $field, options) {
+        init: function(validator, $field, options, validatorName) {
             var fields = options.field.split(',');
             for (var i = 0; i < fields.length; i++) {
                 var compareWith = validator.getFieldElements(fields[i]);
-                validator.onLiveChange(compareWith, 'live_different', function() {
-                    var status = validator.getStatus($field, 'different');
+                validator.onLiveChange(compareWith, 'live_' + validatorName, function() {
+                    var status = validator.getStatus($field, validatorName);
                     if (status !== validator.STATUS_NOT_VALIDATED) {
                         validator.revalidateField($field);
                     }
@@ -3635,11 +3698,11 @@ if (typeof jQuery === 'undefined') {
          * @param {Object} options Consists of the following key:
          * - field: The name of field that will be used to compare with current one
          */
-        destroy: function(validator, $field, options) {
+        destroy: function(validator, $field, options, validatorName) {
             var fields = options.field.split(',');
             for (var i = 0; i < fields.length; i++) {
                 var compareWith = validator.getFieldElements(fields[i]);
-                validator.offLiveChange(compareWith, 'live_different');
+                validator.offLiveChange(compareWith, 'live_' + validatorName);
             }
         },
 
@@ -3653,8 +3716,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'different');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -3668,11 +3731,11 @@ if (typeof jQuery === 'undefined') {
                     continue;
                 }
 
-                var compareValue = validator.getFieldValue(compareWith, 'different');
+                var compareValue = validator.getFieldValue(compareWith, validatorName);
                 if (value === compareValue) {
                     isValid = false;
                 } else if (compareValue !== '') {
-                    validator.updateStatus(compareWith, validator.STATUS_VALID, 'different');
+                    validator.updateStatus(compareWith, validator.STATUS_VALID, validatorName);
                 }
             }
 
@@ -3698,8 +3761,8 @@ if (typeof jQuery === 'undefined') {
          * @param {Object} [options]
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'digits');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -3720,9 +3783,6 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.ean = {
         /**
          * Validate EAN (International Article Number)
-         * Examples:
-         * - Valid: 73513537, 9780471117094, 4006381333931
-         * - Invalid: 73513536
          *
          * @see http://en.wikipedia.org/wiki/European_Article_Number
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -3731,8 +3791,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'ean');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -3790,8 +3850,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Object|Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'ein');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -3844,8 +3904,8 @@ if (typeof jQuery === 'undefined') {
          * - separator: Regex for character or characters expected as separator between addresses; default is comma /[,;]/, i.e. comma or semicolon.
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'emailAddress');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -3944,8 +4004,8 @@ if (typeof jQuery === 'undefined') {
          * - type: The allowed MIME type, separated by a comma
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'file');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -4042,29 +4102,25 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'greaterThan');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
-
+            
             value = this._format(value);
-            if (!$.isNumeric(value)) {
-                return false;
-            }
 
             var locale         = validator.getLocale(),
                 compareTo      = $.isNumeric(options.value) ? options.value : validator.getDynamicOption($field, options.value),
                 compareToValue = this._format(compareTo);
 
-            value = parseFloat(value);
 			return (options.inclusive === true || options.inclusive === undefined)
                     ? {
-                        valid: value >= compareToValue,
+                        valid: $.isNumeric(value) && parseFloat(value) >= compareToValue,
                         message: FormValidation.Helper.format(options.message || FormValidation.I18n[locale].greaterThan['default'], compareTo)
                     }
                     : {
-                        valid: value > compareToValue,
+                        valid: $.isNumeric(value) && parseFloat(value) > compareToValue,
                         message: FormValidation.Helper.format(options.message || FormValidation.I18n[locale].greaterThan.notInclusive, compareTo)
                     };
         },
@@ -4086,9 +4142,6 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.grid = {
         /**
          * Validate GRId (Global Release Identifier)
-         * Examples:
-         * - Valid: A12425GABC1234002M, A1-2425G-ABC1234002-M, A1 2425G ABC1234002 M, Grid:A1-2425G-ABC1234002-M
-         * - Invalid: A1-2425G-ABC1234002-Q
          *
          * @see http://en.wikipedia.org/wiki/Global_Release_Identifier
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -4097,8 +4150,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'grid');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -4134,8 +4187,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'hex');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -4227,9 +4280,11 @@ if (typeof jQuery === 'undefined') {
                     SK: 'Slovakia',
                     SM: 'San Marino',
                     SN: 'Senegal',
+                    TL: 'East Timor',
                     TN: 'Tunisia',
                     TR: 'Turkey',
-                    VG: 'Virgin Islands, British'
+                    VG: 'Virgin Islands, British',
+                    XK: 'Republic of Kosovo'
                 }
             }
         }
@@ -4238,7 +4293,8 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.iban = {
         html5Attributes: {
             message: 'message',
-            country: 'country'
+            country: 'country',
+            sepa: 'sepa'
         },
 
         // http://www.swift.com/dsp/resources/documents/IBAN_Registry.pdf
@@ -4320,11 +4376,21 @@ if (typeof jQuery === 'undefined') {
             SK: 'SK[0-9]{2}[0-9]{4}[0-9]{6}[0-9]{10}',                          // Slovakia
             SM: 'SM[0-9]{2}[A-Z]{1}[0-9]{5}[0-9]{5}[A-Z0-9]{12}',               // San Marino
             SN: 'SN[0-9]{2}[A-Z]{1}[0-9]{23}',                                  // Senegal
+            TL: 'TL38[0-9]{3}[0-9]{14}[0-9]{2}',                                // East Timor
             TN: 'TN59[0-9]{2}[0-9]{3}[0-9]{13}[0-9]{2}',                        // Tunisia
             TR: 'TR[0-9]{2}[0-9]{5}[A-Z0-9]{1}[A-Z0-9]{16}',                    // Turkey
-            VG: 'VG[0-9]{2}[A-Z]{4}[0-9]{16}'                                   // Virgin Islands, British
+            VG: 'VG[0-9]{2}[A-Z]{4}[0-9]{16}',                                  // Virgin Islands, British
+            XK: 'XK[0-9]{2}[0-9]{4}[0-9]{10}[0-9]{2}'                           // Republic of Kosovo
         },
 
+        // List of SEPA country codes
+        SEPA_COUNTRIES: [
+            'AT', 'BE', 'BG', 'CH', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES',
+            'FI', 'FR', 'GB', 'GI', 'GR', 'HR', 'HU', 'IE', 'IS', 'IT',
+            'LI', 'LT', 'LU', 'LV', 'MC', 'MT', 'NL', 'NO', 'PL', 'PT',
+            'RO', 'SE', 'SI', 'SK', 'SM'
+        ],
+
         /**
          * Validate an International Bank Account Number (IBAN)
          * To test it, take the sample IBAN from
@@ -4339,10 +4405,12 @@ if (typeof jQuery === 'undefined') {
          *      - Name of field which its value defines the country code
          *      - Name of callback function that returns the country code
          *      - A callback function that returns the country code
+         * - sepa: Set it to true (false) to indicate that the IBAN number must be (not be) from SEPA countries
+         * By default, this option is not defined
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'iban');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -4358,7 +4426,17 @@ if (typeof jQuery === 'undefined') {
 
             var locale = validator.getLocale();
             if (!this.REGEX[country]) {
-                return true;
+                return false;
+            }
+
+            // Check whether or not the sepa option is enabled
+            if (typeof options.sepa !== undefined) {
+                var isSepaCountry = $.inArray(country, this.SEPA_COUNTRIES) !== -1;
+                if (((options.sepa === 'true' || options.sepa === true) && !isSepaCountry)
+                    || ((options.sepa === 'false' || options.sepa === false) && isSepaCountry))
+                {
+                    return false;
+                }
             }
 
             if (!(new RegExp('^' + this.REGEX[country] + '$')).test(value)) {
@@ -4456,10 +4534,10 @@ if (typeof jQuery === 'undefined') {
          *      - Name of field which its value defines the country code
          *      - Name of callback function that returns the country code
          *      - A callback function that returns the country code
-         * @returns {Boolean|Object}
+         * @returns {Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'id');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -4477,13 +4555,12 @@ if (typeof jQuery === 'undefined') {
                 return true;
             }
 
-            var method  = ['_', country.toLowerCase()].join('');
-            return this[method](value)
-                    ? true
-                    : {
-                        valid: false,
-                        message: FormValidation.Helper.format(options.message || FormValidation.I18n[locale].id.country, FormValidation.I18n[locale].id.countries[country.toUpperCase()])
-                    };
+            var method = ['_', country.toLowerCase()].join(''),
+                result = this[method](value);
+            result         = (result === true || result === false) ? { valid: result } : result;
+            result.message = FormValidation.Helper.format(options.message || FormValidation.I18n[locale].id.country, FormValidation.I18n[locale].id.countries[country.toUpperCase()]);
+
+            return result;
         },
 
         /**
@@ -4576,9 +4653,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Bulgarian national identification number (EGN)
-         * Examples:
-         * - Valid: 7523169263, 8032056031, 803205 603 1, 8001010008, 7501020018, 7552010005, 7542011030
-         * - Invalid: 8019010008
          *
          * @see http://en.wikipedia.org/wiki/Uniform_civil_number
          * @param {String} value The ID
@@ -4616,9 +4690,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Brazilian national identification number (CPF)
-         * Examples:
-         * - Valid: 39053344705, 390.533.447-05, 111.444.777-35
-         * - Invalid: 231.002.999-00
          *
          * @see http://en.wikipedia.org/wiki/Cadastro_de_Pessoas_F%C3%ADsicas
          * @param {String} value The ID
@@ -4657,8 +4728,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Swiss Social Security Number (AHV-Nr/No AVS)
-         * Examples:
-         * - Valid: 756.1234.5678.95, 7561234567895
          *
          * @see http://en.wikipedia.org/wiki/National_identification_number#Switzerland
          * @see http://www.bsv.admin.ch/themen/ahv/00011/02185/index.html?lang=de
@@ -4682,8 +4751,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Chilean national identification number (RUN/RUT)
-         * Examples:
-         * - Valid: 76086428-5, 22060449-7, 12531909-2
          *
          * @see http://en.wikipedia.org/wiki/National_identification_number#Chile
          * @see https://palena.sii.cl/cvc/dte/ee_empresas_emisoras.html for samples
@@ -4742,7 +4809,7 @@ if (typeof jQuery === 'undefined') {
             if (!/^\d{15}$/.test(value) && !/^\d{17}[\dXx]{1}$/.test(value)) {
                 return false;
             }
-
+            
             // Check China PR Administrative division code
             var adminDivisionCodes = {
                 11: {
@@ -5196,11 +5263,11 @@ if (typeof jQuery === 'undefined') {
                 81: { 0: [0] },
                 82: { 0: [0] }
             };
-
+            
             var provincial  = parseInt(value.substr(0, 2), 10),
                 prefectural = parseInt(value.substr(2, 2), 10),
                 county      = parseInt(value.substr(4, 2), 10);
-
+            
             if (!adminDivisionCodes[provincial] || !adminDivisionCodes[provincial][prefectural]) {
                 return false;
             }
@@ -5218,12 +5285,12 @@ if (typeof jQuery === 'undefined') {
             if (!inRange) {
                 return false;
             }
-
+            
             // Check date of birth
             var dob;
             if (value.length === 18) {
                 dob = value.substr(6, 8);
-            } else /* length == 15 */ {
+            } else /* length == 15 */ { 
                 dob = '19' + value.substr(6, 6);
             }
             var year  = parseInt(dob.substr(0, 4), 10),
@@ -5232,7 +5299,7 @@ if (typeof jQuery === 'undefined') {
             if (!FormValidation.Helper.date(year, month, day)) {
                 return false;
             }
-
+            
             // Check checksum (18-digit system only)
             if (value.length === 18) {
                 var sum    = 0,
@@ -5244,15 +5311,12 @@ if (typeof jQuery === 'undefined') {
                 var checksum = (value.charAt(17).toUpperCase() !== 'X') ? parseInt(value.charAt(17), 10) : 10;
                 return checksum === sum;
             }
-
+            
             return true;
         },
-
+        
         /**
          * Validate Czech national identification number (RC)
-         * Examples:
-         * - Valid: 7103192745, 991231123
-         * - Invalid: 1103492745, 590312123
          *
          * @param {String} value The ID
          * @returns {Boolean}
@@ -5293,9 +5357,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Danish Personal Identification number (CPR)
-         * Examples:
-         * - Valid: 2110625629, 211062-5629
-         * - Invalid: 511062-5629
          *
          * @see https://en.wikipedia.org/wiki/Personal_identification_number_(Denmark)
          * @param {String} value The ID
@@ -5328,8 +5389,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Estonian Personal Identification Code (isikukood)
-         * Examples:
-         * - Valid: 37605030299
          *
          * @see http://et.wikipedia.org/wiki/Isikukood
          * @param {String} value The ID
@@ -5342,22 +5401,11 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Spanish personal identity code (DNI)
-         * Support i) DNI (for Spanish citizens), ii) NIE (for foreign people)
-         * and iii) CIF (for legal entities)
-         *
-         * Examples:
-         * - Valid:
-         *      i) 54362315K, 54362315-K
-         *      ii) X2482300W, X-2482300W, X-2482300-W
-         *      iii) A58818501, A-58818501
-         * - Invalid:
-         *      i) 54362315Z
-         *      ii) X-2482300A
-         *      iii) K58818501, G58818507
+         * Support DNI (for Spanish citizens), NIE (for foreign people) and CIF (for legal entities)
          *
          * @see https://en.wikipedia.org/wiki/National_identification_number#Spain
          * @param {String} value The ID
-         * @returns {Boolean}
+         * @returns {Boolean|Object}
          */
         _es: function(value) {
             var isDNI = /^[0-9]{8}[-]{0,1}[A-HJ-NP-TV-Z]$/.test(value),
@@ -5368,19 +5416,25 @@ if (typeof jQuery === 'undefined') {
             }
 
             value = value.replace(/-/g, '');
-            var check;
+            var check, type, isValid = true;
             if (isDNI || isNIE) {
+                type = 'DNI';
                 var index = 'XYZ'.indexOf(value.charAt(0));
                 if (index !== -1) {
                     // It is NIE number
                     value = index + value.substr(1) + '';
+                    type  = 'NIE';
                 }
 
                 check = parseInt(value.substr(0, 8), 10);
                 check = 'TRWAGMYFPDXBNJZSQVHLCKE'[check % 23];
-                return (check === value.substr(8, 1));
+                return {
+                    valid: (check === value.substr(8, 1)),
+                    type: type
+                };
             } else {
                 check = value.substr(1, 7);
+                type  = 'CIF';
                 var letter  = value[0],
                     control = value.substr(-1),
                     sum     = 0;
@@ -5407,25 +5461,27 @@ if (typeof jQuery === 'undefined') {
                 if (lastDigit !== 0) {
                     lastDigit = 10 - lastDigit;
                 }
-
+                
                 if ('KQS'.indexOf(letter) !== -1) {
                     // If the CIF starts with a K, Q or S, the control digit must be a letter
-                    return (control === 'JABCDEFGHI'[lastDigit]);
+                    isValid = (control === 'JABCDEFGHI'[lastDigit]);
                 } else if ('ABEH'.indexOf(letter) !== -1) {
                     // If it starts with A, B, E or H, it has to be a number
-                    return (control === ('' + lastDigit));
+                    isValid = (control === ('' + lastDigit));
                 } else {
                     // In any other case, it doesn't matter
-                    return (control === ('' + lastDigit) || control === 'JABCDEFGHI'[lastDigit]);
+                    isValid = (control === ('' + lastDigit) || control === 'JABCDEFGHI'[lastDigit]);
                 }
+
+                return {
+                    valid: isValid,
+                    type: type
+                };
             }
         },
 
         /**
          * Validate Finnish Personal Identity Code (HETU)
-         * Examples:
-         * - Valid: 311280-888Y, 131052-308T
-         * - Invalid: 131052-308U, 310252-308Y
          *
          * @param {String} value The ID
          * @returns {Boolean}
@@ -5459,9 +5515,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Croatian personal identification number (OIB)
-         * Examples:
-         * - Valid: 33392005961
-         * - Invalid: 33392005962
          *
          * @param {String} value The ID
          * @returns {Boolean}
@@ -5475,9 +5528,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Irish Personal Public Service Number (PPS)
-         * Examples:
-         * - Valid: 6433435F, 6433435FT, 6433435FW, 6433435OA, 6433435IH, 1234567TW, 1234567FA
-         * - Invalid: 6433435E, 6433435VH
          *
          * @see https://en.wikipedia.org/wiki/Personal_Public_Service_Number
          * @param {String} value The ID
@@ -5513,10 +5563,8 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Iceland national identification number (Kennitala)
-         * Examples:
-         * - Valid: 120174-3399, 1201743399, 0902862349
          *
-         * @see http://en.wikipedia.org/wiki/Kennitala
+         *  @see http://en.wikipedia.org/wiki/Kennitala
          * @param {String} value The ID
          * @returns {Boolean}
          */
@@ -5546,9 +5594,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Lithuanian Personal Code (Asmens kodas)
-         * Examples:
-         * - Valid: 38703181745
-         * - Invalid: 38703181746, 78703181745, 38703421745
          *
          * @see http://en.wikipedia.org/wiki/National_identification_number#Lithuania
          * @see http://www.adomas.org/midi2007/pcode.html
@@ -5595,9 +5640,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Latvian Personal Code (Personas kods)
-         * Examples:
-         * - Valid: 161175-19997, 16117519997
-         * - Invalid: 161375-19997
          *
          * @see http://laacz.lv/2006/11/25/pk-parbaudes-algoritms/
          * @param {String} value The ID
@@ -5630,16 +5672,17 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Dutch national identification number (BSN)
-         * Examples:
-         * - Valid: 111222333, 941331490, 9413.31.490
-         * - Invalid: 111252333
          *
          * @see https://nl.wikipedia.org/wiki/Burgerservicenummer
          * @param {String} value The ID
          * @returns {Boolean}
          */
         _nl: function(value) {
-            while (value.length < 9) {
+            if (value.length < 8) {
+                return false;
+            }
+
+            if (value.length === 8) {
                 value = '0' + value;
             }
             if (!/^[0-9]{4}[.]{0,1}[0-9]{2}[.]{0,1}[0-9]{3}$/.test(value)) {
@@ -5660,10 +5703,10 @@ if (typeof jQuery === 'undefined') {
             }
             return (sum + '' === value.charAt(length - 1));
         },
-
+        
         /**
          * Validate Poland citizen number (PESEL)
-         *
+         * 
          * @see http://en.wikipedia.org/wiki/National_identification_number#Poland
          * @see http://en.wikipedia.org/wiki/PESEL
          * @param {String} value The ID
@@ -5692,9 +5735,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Romanian numerical personal code (CNP)
-         * Examples:
-         * - Valid: 1630615123457, 1800101221144
-         * - Invalid: 8800101221144, 1632215123457, 1630615123458
          *
          * @see http://en.wikipedia.org/wiki/National_identification_number#Romania
          * @param {String} value The ID
@@ -5748,9 +5788,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Swedish personal identity number (personnummer)
-         * Examples:
-         * - Valid: 8112289874, 811228-9874, 811228+9874
-         * - Invalid: 811228-9873
          *
          * @see http://en.wikipedia.org/wiki/Personal_identity_number_(Sweden)
          * @param {String} value The ID
@@ -5775,9 +5812,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Slovak national identifier number (RC)
-         * Examples:
-         * - Valid: 7103192745, 991231123
-         * - Invalid: 7103192746, 1103492745
          *
          * @param {String} value The ID
          * @returns {Boolean}
@@ -5800,9 +5834,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Thailand citizen number
-         * Examples:
-         * - Valid: 7145620509547, 3688699975685, 2368719339716
-         * - Invalid: 1100800092310
          *
          * @see http://en.wikipedia.org/wiki/National_identification_number#Thailand
          * @param {String} value The ID
@@ -5823,9 +5854,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate South African ID
-         * Example:
-         * - Valid: 8001015009087
-         * - Invalid: 8001015009287, 8001015009086
          *
          * @see http://en.wikipedia.org/wiki/National_identification_number#South_Africa
          * @param {String} value The ID
@@ -5873,10 +5901,10 @@ if (typeof jQuery === 'undefined') {
          * @param {Object} options Consists of the following key:
          * - field: The name of field that will be used to compare with current one
          */
-        init: function(validator, $field, options) {
+        init: function(validator, $field, options, validatorName) {
             var compareWith = validator.getFieldElements(options.field);
-            validator.onLiveChange(compareWith, 'live_identical', function() {
-                var status = validator.getStatus($field, 'identical');
+            validator.onLiveChange(compareWith, 'live_' + validatorName, function() {
+                var status = validator.getStatus($field, validatorName);
                 if (status !== validator.STATUS_NOT_VALIDATED) {
                     validator.revalidateField($field);
                 }
@@ -5891,9 +5919,9 @@ if (typeof jQuery === 'undefined') {
          * @param {Object} options Consists of the following key:
          * - field: The name of field that will be used to compare with current one
          */
-        destroy: function(validator, $field, options) {
+        destroy: function(validator, $field, options, validatorName) {
             var compareWith = validator.getFieldElements(options.field);
-            validator.offLiveChange(compareWith, 'live_identical');
+            validator.offLiveChange(compareWith, 'live_' + validatorName);
         },
 
         /**
@@ -5905,16 +5933,16 @@ if (typeof jQuery === 'undefined') {
          * - field: The name of field that will be used to compare with current one
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value       = validator.getFieldValue($field, 'identical'),
+        validate: function(validator, $field, options, validatorName) {
+            var value       = validator.getFieldValue($field, validatorName),
                 compareWith = validator.getFieldElements(options.field);
             if (compareWith === null || compareWith.length === 0) {
                 return true;
             }
 
-            var compareValue = validator.getFieldValue(compareWith, 'identical');
+            var compareValue = validator.getFieldValue(compareWith, validatorName);
             if (value === compareValue) {
-                validator.updateStatus(compareWith, validator.STATUS_VALID, 'identical');
+                validator.updateStatus(compareWith, validator.STATUS_VALID, validatorName);
                 return true;
             }
 
@@ -5934,9 +5962,6 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.imei = {
         /**
          * Validate IMEI (International Mobile Station Equipment Identity)
-         * Examples:
-         * - Valid: 35-209900-176148-1, 35-209900-176148-23, 3568680000414120, 490154203237518
-         * - Invalid: 490154203237517
          *
          * @see http://en.wikipedia.org/wiki/International_Mobile_Station_Equipment_Identity
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -5945,8 +5970,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'imei');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -5982,9 +6007,6 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.imo = {
         /**
          * Validate IMO (International Maritime Organization)
-         * Examples:
-         * - Valid: IMO 8814275, IMO 9176187
-         * - Invalid: IMO 8814274
          *
          * @see http://en.wikipedia.org/wiki/IMO_Number
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -5993,8 +6015,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'imo');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6002,15 +6024,10 @@ if (typeof jQuery === 'undefined') {
             if (!/^IMO \d{7}$/i.test(value)) {
                 return false;
             }
-
+            
             // Grab just the digits
             var sum    = 0,
                 digits = value.replace(/^.*(\d{7})$/, '$1');
-
-            // Go over each char, multiplying by the inverse of it's position
-            // IMO 9176187
-            // (9 * 7) + (1 * 6) + (7 * 5) + (6 * 4) + (1 * 3) + (8 * 2) = 147
-            // Take the last digit of that, that's the check digit (7)
             for (var i = 6; i >= 1; i--) {
                 sum += (digits.slice((6 - i), -i) * (i + 1));
             }
@@ -6029,6 +6046,12 @@ if (typeof jQuery === 'undefined') {
     });
 
     FormValidation.Validator.integer = {
+        html5Attributes: {
+            message: 'message',
+            thousandsseparator: 'thousandsSeparator',
+            decimalseparator: 'decimalSeparator'
+        },
+
         enableByHtml5: function($field) {
             return ('number' === $field.attr('type')) && ($field.attr('step') === undefined || $field.attr('step') % 1 === 0);
         },
@@ -6040,18 +6063,47 @@ if (typeof jQuery === 'undefined') {
          * @param {jQuery} $field Field element
          * @param {Object} options Can consist of the following key:
          * - message: The invalid message
+         * - thousandsSeparator: The thousands separator. It's empty by default
+         * - decimalSeparator: The decimal separator. It's '.' by default
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
+        validate: function(validator, $field, options, validatorName) {
             if (this.enableByHtml5($field) && $field.get(0).validity && $field.get(0).validity.badInput === true) {
                 return false;
             }
 
-            var value = validator.getFieldValue($field, 'integer');
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
-            return /^(?:-?(?:0|[1-9][0-9]*))$/.test(value);
+
+            var decimalSeparator   = options.decimalSeparator   || '.',
+                thousandsSeparator = options.thousandsSeparator || '';
+            decimalSeparator       = (decimalSeparator   === '.') ? '\\.' : decimalSeparator;
+            thousandsSeparator     = (thousandsSeparator === '.') ? '\\.' : thousandsSeparator;
+
+            var testRegexp         = new RegExp('^-?[0-9]{1,3}(' + thousandsSeparator + '[0-9]{3})*(' + decimalSeparator + '[0-9]+)?$'),
+                thousandsReplacer  = new RegExp(thousandsSeparator, 'g');
+
+            if (!testRegexp.test(value)) {
+                return false;
+            }
+
+            // Replace thousands separator with blank
+            if (thousandsSeparator) {
+                value = value.replace(thousandsReplacer, '');
+            }
+            // Replace decimal separator with a dot
+            if (decimalSeparator) {
+                value = value.replace(decimalSeparator, '.');
+            }
+
+            if (isNaN(value) || !isFinite(value)) {
+                return false;
+            }
+            // TODO: Use Number.isInteger() if available
+            value = parseFloat(value);
+            return Math.floor(value) === value;
         }
     };
 }(jQuery));
@@ -6084,8 +6136,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'ip');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6135,23 +6187,16 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.isbn = {
         /**
          * Return true if the input value is a valid ISBN 10 or ISBN 13 number
-         * Examples:
-         * - Valid:
-         * ISBN 10: 99921-58-10-7, 9971-5-0210-0, 960-425-059-0, 80-902734-1-6, 85-359-0277-5, 1-84356-028-3, 0-684-84328-5, 0-8044-2957-X, 0-85131-041-9, 0-943396-04-2, 0-9752298-0-X
-         * ISBN 13: 978-0-306-40615-7
-         * - Invalid:
-         * ISBN 10: 99921-58-10-6
-         * ISBN 13: 978-0-306-40615-6
          *
          * @see http://en.wikipedia.org/wiki/International_Standard_Book_Number
          * @param {FormValidation.Base} validator The validator plugin instance
          * @param {jQuery} $field Field element
          * @param {Object} [options] Can consist of the following keys:
          * - message: The invalid message
-         * @returns {Boolean}
+         * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'isbn');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6194,7 +6239,10 @@ if (typeof jQuery === 'undefined') {
                     } else if (checksum === 10) {
                         checksum = 'X';
                     }
-                    return (checksum + '' === chars[length - 1]);
+                    return {
+                        type: type,
+                        valid: (checksum + '' === chars[length - 1])
+                    };
 
                 case 'ISBN13':
                     sum = 0;
@@ -6205,7 +6253,10 @@ if (typeof jQuery === 'undefined') {
                     if (checksum === 10) {
                         checksum = '0';
                     }
-                    return (checksum + '' === chars[length - 1]);
+                    return {
+                        type: type,
+                        valid: (checksum + '' === chars[length - 1])
+                    };
 
                 default:
                     return false;
@@ -6229,9 +6280,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate an ISIN (International Securities Identification Number)
-         * Examples:
-         * - Valid: US0378331005, AU0000XVGZA3, GB0002634946
-         * - Invalid: US0378331004, AA0000XVGZA3
          *
          * @see http://en.wikipedia.org/wiki/International_Securities_Identifying_Number
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -6240,8 +6288,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'isin');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6288,19 +6336,16 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.ismn = {
         /**
          * Validate ISMN (International Standard Music Number)
-         * Examples:
-         * - Valid: M230671187, 979-0-0601-1561-5, 979 0 3452 4680 5, 9790060115615
-         * - Invalid: 9790060115614
          *
          * @see http://en.wikipedia.org/wiki/International_Standard_Music_Number
          * @param {FormValidation.Base} validator The validator plugin instance
          * @param {jQuery} $field Field element
          * @param {Object} options Can consist of the following keys:
          * - message: The invalid message
-         * @returns {Boolean}
+         * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'ismn');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6335,7 +6380,10 @@ if (typeof jQuery === 'undefined') {
                 sum += parseInt(value.charAt(i), 10) * weight[i % 2];
             }
             sum = 10 - sum % 10;
-            return (sum + '' === value.charAt(length - 1));
+            return {
+                type: type,
+                valid: (sum + '' === value.charAt(length - 1))
+            };
         }
     };
 }(jQuery));
@@ -6351,9 +6399,6 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.issn = {
         /**
          * Validate ISSN (International Standard Serial Number)
-         * Examples:
-         * - Valid: 0378-5955, 0024-9319, 0032-1478
-         * - Invalid: 0032-147X
          *
          * @see http://en.wikipedia.org/wiki/International_Standard_Serial_Number
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -6362,8 +6407,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'issn');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6434,29 +6479,25 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'lessThan');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
-
+            
 			value = this._format(value);
-            if (!$.isNumeric(value)) {
-                return false;
-            }
 
             var locale         = validator.getLocale(),
                 compareTo      = $.isNumeric(options.value) ? options.value : validator.getDynamicOption($field, options.value),
                 compareToValue = this._format(compareTo);
 
-            value = parseFloat(value);
             return (options.inclusive === true || options.inclusive === undefined)
                     ? {
-                        valid: value <= compareToValue,
+                        valid: $.isNumeric(value) && parseFloat(value) <= compareToValue,
                         message: FormValidation.Helper.format(options.message || FormValidation.I18n[locale].lessThan['default'], compareTo)
                     }
                     : {
-                        valid: value < compareToValue,
+                        valid: $.isNumeric(value) && parseFloat(value) < compareToValue,
                         message: FormValidation.Helper.format(options.message || FormValidation.I18n[locale].lessThan.notInclusive, compareTo)
                     };
         },
@@ -6485,8 +6526,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'mac');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6507,9 +6548,6 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.meid = {
         /**
          * Validate MEID (Mobile Equipment Identifier)
-         * Examples:
-         * - Valid: 293608736500703710, 29360-87365-0070-3710, AF0123450ABCDE, AF-012345-0ABCDE
-         * - Invalid: 2936087365007037101
          *
          * @see http://en.wikipedia.org/wiki/Mobile_equipment_identifier
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -6518,8 +6556,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'meid');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6605,7 +6643,7 @@ if (typeof jQuery === 'undefined') {
          * @param {Object} options
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
+        validate: function(validator, $field, options, validatorName) {
             var type = $field.attr('type');
             if ('radio' === type || 'checkbox' === type) {
                 var ns = validator.getNamespace();
@@ -6619,7 +6657,7 @@ if (typeof jQuery === 'undefined') {
                 return true;
             }
 
-            var value = validator.getFieldValue($field, 'notEmpty');
+            var value = validator.getFieldValue($field, validatorName);
             return $.trim(value) !== '';
         }
     };
@@ -6636,7 +6674,9 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.numeric = {
         html5Attributes: {
             message: 'message',
-            separator: 'separator'
+            separator: 'separator',     // deprecated
+            thousandsseparator: 'thousandsSeparator',
+            decimalseparator: 'decimalSeparator'
         },
 
         enableByHtml5: function($field) {
@@ -6650,21 +6690,39 @@ if (typeof jQuery === 'undefined') {
          * @param {jQuery} $field Field element
          * @param {Object} options Consist of key:
          * - message: The invalid message
-         * - separator: The decimal separator. Can be "." (default), ","
+         * - thousandsSeparator: The thousands separator. It's empty by default
+         * - separator, decimalSeparator: The decimal separator. It's '.' by default
+         * The separator option is deprecated and should be replaced with decimalSeparator
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
+        validate: function(validator, $field, options, validatorName) {
             if (this.enableByHtml5($field) && $field.get(0).validity && $field.get(0).validity.badInput === true) {
                 return false;
             }
 
-            var value = validator.getFieldValue($field, 'numeric');
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
-            var separator = options.separator || '.';
-            if (separator !== '.') {
-                value = value.replace(separator, '.');
+            var decimalSeparator   = options.separator || options.decimalSeparator || '.',
+                thousandsSeparator = options.thousandsSeparator || '';
+            decimalSeparator       = (decimalSeparator   === '.') ? '\\.' : decimalSeparator;
+            thousandsSeparator     = (thousandsSeparator === '.') ? '\\.' : thousandsSeparator;
+
+            var testRegexp         = new RegExp('^-?[0-9]{1,3}(' + thousandsSeparator + '[0-9]{3})*(' + decimalSeparator + '[0-9]+)?$'),
+                thousandsReplacer  = new RegExp(thousandsSeparator, 'g');
+
+            if (!testRegexp.test(value)) {
+                return false;
+            }
+
+            // Replace thousands separator with blank
+            if (thousandsSeparator) {
+                value = value.replace(thousandsReplacer, '');
+            }
+            // Replace decimal separator with a dot
+            if (decimalSeparator) {
+                value = value.replace(decimalSeparator, '.');
             }
 
             return !isNaN(parseFloat(value)) && isFinite(value);
@@ -6728,8 +6786,8 @@ if (typeof jQuery === 'undefined') {
          *
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'phone');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6752,7 +6810,7 @@ if (typeof jQuery === 'undefined') {
                     value   = $.trim(value);
                     isValid = (/^(((\+|00)?971[\s\.-]?(\(0\)[\s\.-]?)?|0)(\(5(0|2|5|6)\)|5(0|2|5|6)|2|3|4|6|7|9)|60)([\s\.-]?[0-9]){7}$/).test(value);
                     break;
-
+                    
                 case 'BG':
                     // https://regex101.com/r/yE6vN4/1
                     // See http://en.wikipedia.org/wiki/Telephone_numbers_in_Bulgaria
@@ -6817,7 +6875,7 @@ if (typeof jQuery === 'undefined') {
                     value   = $.trim(value);
                     isValid = (/^\(?(?:(?:0(?:0|11)\)?[\s-]?\(?|\+)44\)?[\s-]?\(?(?:0\)?[\s-]?\(?)?|0)(?:\d{2}\)?[\s-]?\d{4}[\s-]?\d{4}|\d{3}\)?[\s-]?\d{3}[\s-]?\d{3,4}|\d{4}\)?[\s-]?(?:\d{5}|\d{3}[\s-]?\d{3})|\d{5}\)?[\s-]?\d{4,5}|8(?:00[\s-]?11[\s-]?11|45[\s-]?46[\s-]?4\d))(?:(?:[\s-]?(?:x|ext\.?\s?|\#)\d+)?)$/).test(value);
                     break;
-
+            
                 case 'IN':
                     // http://stackoverflow.com/questions/18351553/regular-expression-validation-for-indian-phone-number-and-mobile-number
                     // http://regex101.com/r/qL6eZ5/1
@@ -6825,21 +6883,21 @@ if (typeof jQuery === 'undefined') {
                     value   = $.trim(value);
                     isValid = (/((\+?)((0[ -]+)*|(91 )*)(\d{12}|\d{10}))|\d{5}([- ]*)\d{6}/).test(value);
                     break;
-
+                    
                 case 'MA':
                     // http://en.wikipedia.org/wiki/Telephone_numbers_in_Morocco
                     // http://regexr.com/399n8
                     value   = $.trim(value);
                     isValid = (/^(?:(?:(?:\+|00)212[\s]?(?:[\s]?\(0\)[\s]?)?)|0){1}(?:5[\s.-]?[2-3]|6[\s.-]?[13-9]){1}[0-9]{1}(?:[\s.-]?\d{2}){3}$/).test(value);
                     break;
-
+                
                 case 'NL':
                     // http://en.wikipedia.org/wiki/Telephone_numbers_in_the_Netherlands
                     // http://regexr.com/3aevr
                     value   = $.trim(value);
                     isValid = (/^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)[1-9]((\s|\s?\-\s?)?[0-9])((\s|\s?-\s?)?[0-9])((\s|\s?-\s?)?[0-9])\s?[0-9]\s?[0-9]\s?[0-9]\s?[0-9]\s?[0-9]$/gm).test(value);
                     break;
-
+                
                 case 'PK':
                     // http://regex101.com/r/yH8aV9/2
                     value   = $.trim(value);
@@ -6872,7 +6930,7 @@ if (typeof jQuery === 'undefined') {
                     value   = $.trim(value);
                     isValid = (/^0(?:2(?:12|4[0-9]|5[1-9]|6[0-9]|7[0-8]|8[1-35-8]|9[1-5]|3[45789])|4(?:1[246]|2[46]))\d{7}$/).test(value);
                     break;
-
+  
                 case 'US':
                 /* falls through */
                 default:
@@ -6891,6 +6949,74 @@ if (typeof jQuery === 'undefined') {
         }
     };
 }(jQuery));
+;(function($) {
+    FormValidation.I18n = $.extend(true, FormValidation.I18n || {}, {
+        'en_US': {
+            promise: {
+                'default': 'Please enter a valid value'
+            }
+        }
+    });
+
+    FormValidation.Validator.promise = {
+        html5Attributes: {
+            message: 'message',
+            promise: 'promise'
+        },
+
+        /**
+         * Return result from a jQuery's Deferred object
+         *
+         * @param {FormValidation.Base} validator The validator plugin instance
+         * @param {jQuery} $field Field element
+         * @param {Object} options Can consist of the following keys:
+         * - promise: The method that passes parameters:
+         *      promise: function(fieldValue, validator, $field) {
+         *          // fieldValue is the value of field
+         *          // validator is instance of FormValidation.Base
+         *          // $field is the field element
+         *
+         *          var dfd = new $.Deferred();
+         *
+         *          // Do something ...
+         *
+         *          // Resolve when particular task is done
+         *          dfd.resolve({
+         *              valid: true or false,       // Required
+         *              message: 'Other message',   // Optional
+         *              key: value                  // You can attach more data to reuse later
+         *          });
+         *
+         *          // You can reject if there's error
+         *          dfd.reject({
+         *              message: 'Other message',   // Optional
+         *              key: value                  // You can attach more data to reuse later
+         *          });
+         *
+         *          return dfd.promise();
+         *      }
+         * - message: The invalid message
+         * @returns {Deferred}
+         */
+        validate: function(validator, $field, options, validatorName) {
+            var value   = validator.getFieldValue($field, validatorName),
+                dfd     = new $.Deferred(),
+                promise = FormValidation.Helper.call(options.promise, [value, validator, $field]);
+
+            promise
+                .done(function(result) {
+                    dfd.resolve($field, validatorName, result);
+                })
+                .fail(function(result) {
+                    result = result || {};
+                    result.valid = false;
+                    dfd.resolve($field, validatorName, result);
+                });
+
+            return dfd;
+        }
+    };
+}(jQuery));
 ;(function($) {
     FormValidation.I18n = $.extend(true, FormValidation.I18n || {}, {
         'en_US': {
@@ -6926,8 +7052,8 @@ if (typeof jQuery === 'undefined') {
          * - regexp: The regular expression you need to check
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'regexp');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -6962,12 +7088,12 @@ if (typeof jQuery === 'undefined') {
         /**
          * Destroy the timer when destroying the FormValidation (using validator.destroy() method)
          */
-        destroy: function(validator, $field, options) {
+        destroy: function(validator, $field, options, validatorName) {
             var ns    = validator.getNamespace(),
-                timer = $field.data(ns + '.remote.timer');
+                timer = $field.data(ns + '.' + validatorName + '.timer');
             if (timer) {
                 clearTimeout(timer);
-                $field.removeData(ns + '.remote.timer');
+                $field.removeData(ns + '.' + validatorName + '.timer');
             }
         },
 
@@ -6994,12 +7120,12 @@ if (typeof jQuery === 'undefined') {
          * This is useful when connecting to external remote server or APIs provided by 3rd parties
          * @returns {Deferred}
          */
-        validate: function(validator, $field, options) {
+        validate: function(validator, $field, options, validatorName) {
             var ns    = validator.getNamespace(),
-                value = validator.getFieldValue($field, 'remote'),
+                value = validator.getFieldValue($field, validatorName),
                 dfd   = new $.Deferred();
             if (value === '') {
-                dfd.resolve($field, 'remote', { valid: true });
+                dfd.resolve($field, validatorName, { valid: true });
                 return dfd;
             }
             var name     = $field.attr('data-' + ns + '-field'),
@@ -7009,7 +7135,7 @@ if (typeof jQuery === 'undefined') {
 
             // Support dynamic data
             if ('function' === typeof data) {
-                data = data.call(this, validator);
+                data = data.call(this, validator, $field, value);
             }
 
             // Parse string data from HTML5 attribute
@@ -7019,7 +7145,7 @@ if (typeof jQuery === 'undefined') {
 
             // Support dynamic url
             if ('function' === typeof url) {
-                url = url.call(this, validator);
+                url = url.call(this, validator, $field, value);
             }
 
             data[options.name || name] = value;
@@ -7043,10 +7169,10 @@ if (typeof jQuery === 'undefined') {
                         response.valid = (response[validKey] === true || response[validKey] === 'true')
                                         ? true
                                         : (response[validKey] === false || response[validKey] === 'false' ? false : null);
-                        dfd.resolve($field, 'remote', response);
+                        dfd.resolve($field, validatorName, response);
                     })
                     .error(function(response) {
-                        dfd.resolve($field, 'remote', {
+                        dfd.resolve($field, validatorName, {
                             valid: false
                         });
                     });
@@ -7057,15 +7183,15 @@ if (typeof jQuery === 'undefined') {
 
                 return dfd;
             }
-
+            
             if (options.delay) {
                 // Since the form might have multiple fields with the same name
                 // I have to attach the timer to the field element
-                if ($field.data(ns + '.remote.timer')) {
-                    clearTimeout($field.data(ns + '.remote.timer'));
+                if ($field.data(ns + '.' + validatorName + '.timer')) {
+                    clearTimeout($field.data(ns + '.' + validatorName + '.timer'));
                 }
 
-                $field.data(ns + '.remote.timer', setTimeout(runCallback, options.delay));
+                $field.data(ns + '.' + validatorName + '.timer', setTimeout(runCallback, options.delay));
                 return dfd;
             } else {
                 return runCallback();
@@ -7085,8 +7211,6 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.rtn = {
         /**
          * Validate a RTN (Routing transit number)
-         * Examples:
-         * - Valid: 021200025, 789456124
          *
          * @see http://en.wikipedia.org/wiki/Routing_transit_number
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -7095,8 +7219,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'rtn');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -7127,8 +7251,6 @@ if (typeof jQuery === 'undefined') {
     FormValidation.Validator.sedol = {
         /**
          * Validate a SEDOL (Stock Exchange Daily Official List)
-         * Examples:
-         * - Valid: 0263494, B0WNLY7
          *
          * @see http://en.wikipedia.org/wiki/SEDOL
          * @param {FormValidation.Base} validator The validator plugin instance
@@ -7137,8 +7259,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'sedol');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -7178,8 +7300,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
 		 * @returns {Boolean}
 		 */
-		validate: function(validator, $field, options) {
-			var value = validator.getFieldValue($field, 'siren');
+		validate: function(validator, $field, options, validatorName) {
+			var value = validator.getFieldValue($field, validatorName);
 			if (value === '') {
 				return true;
 			}
@@ -7210,8 +7332,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-		validate: function(validator, $field, options) {
-			var value = validator.getFieldValue($field, 'siret');
+		validate: function(validator, $field, options, validatorName) {
+			var value = validator.getFieldValue($field, validatorName);
 			if (value === '') {
 				return true;
 			}
@@ -7260,8 +7382,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'step');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -7328,8 +7450,8 @@ if (typeof jQuery === 'undefined') {
          * - case: Can be 'lower' (default) or 'upper'
          * @returns {Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'stringCase');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -7398,8 +7520,8 @@ if (typeof jQuery === 'undefined') {
          * - utf8bytes: Evaluate string length in UTF-8 bytes, default to false
          * @returns {Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'stringLength');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (options.trim === true || options.trim === 'true') {
                 value = $.trim(value);
             }
@@ -7441,11 +7563,11 @@ if (typeof jQuery === 'undefined') {
                     break;
 
                 case (!!min):
-                    message = FormValidation.Helper.format(options.message || FormValidation.I18n[locale].stringLength.more, parseInt(min, 10));
+                    message = FormValidation.Helper.format(options.message || FormValidation.I18n[locale].stringLength.more, parseInt(min, 10) - 1);
                     break;
 
                 case (!!max):
-                    message = FormValidation.Helper.format(options.message || FormValidation.I18n[locale].stringLength.less, parseInt(max, 10));
+                    message = FormValidation.Helper.format(options.message || FormValidation.I18n[locale].stringLength.less, parseInt(max, 10) + 1);
                     break;
 
                 default:
@@ -7492,8 +7614,8 @@ if (typeof jQuery === 'undefined') {
          * - protocol: The protocols, separated by a comma. Default to "http, https, ftp"
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'uri');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -7606,8 +7728,8 @@ if (typeof jQuery === 'undefined') {
          * - version: Can be 3, 4, 5, null
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'uuid');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -7704,10 +7826,10 @@ if (typeof jQuery === 'undefined') {
          *      - Name of field which its value defines the country code
          *      - Name of callback function that returns the country code
          *      - A callback function that returns the country code
-         * @returns {Boolean|Object}
+         * @returns {Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'vat');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -7725,22 +7847,18 @@ if (typeof jQuery === 'undefined') {
                 return true;
             }
 
-            var method  = ['_', country.toLowerCase()].join('');
-            return this[method](value)
-                ? true
-                : {
-                    valid: false,
-                    message: FormValidation.Helper.format(options.message || FormValidation.I18n[locale].vat.country, FormValidation.I18n[locale].vat.countries[country.toUpperCase()])
-                };
+            var method  = ['_', country.toLowerCase()].join(''),
+                result = this[method](value);
+            result         = (result === true || result === false) ? { valid: result } : result;
+            result.message = FormValidation.Helper.format(options.message || FormValidation.I18n[locale].vat.country, FormValidation.I18n[locale].vat.countries[country.toUpperCase()]);
+
+            return result;
         },
 
         // VAT validators
 
         /**
          * Validate Austrian VAT number
-         * Example:
-         * - Valid: ATU13585627
-         * - Invalid: ATU13585626
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -7775,9 +7893,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Belgian VAT number
-         * Example:
-         * - Valid: BE0428759497
-         * - Invalid: BE431150351
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -7803,12 +7918,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Bulgarian VAT number
-         * Example:
-         * - Valid: BG175074752,
-         * BG7523169263, BG8032056031,
-         * BG7542011030,
-         * BG7111042925
-         * - Invalid: BG175074753, BG7552A10004, BG7111042922
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -7897,7 +8006,7 @@ if (typeof jQuery === 'undefined') {
 
             return false;
         },
-
+        
         /**
          * Validate Brazilian VAT number (CNPJ)
          *
@@ -7990,9 +8099,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Cypriot VAT number
-         * Examples:
-         * - Valid: CY10259033P
-         * - Invalid: CY10259033Z
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8030,14 +8136,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Czech Republic VAT number
-         * Can be:
-         * i) Legal entities (8 digit numbers)
-         * ii) Individuals with a RC (the 9 or 10 digit Czech birth number)
-         * iii) Individuals without a RC (9 digit numbers beginning with 6)
-         *
-         * Examples:
-         * - Valid: i) CZ25123891; ii) CZ7103192745, CZ991231123; iii) CZ640903926
-         * - Invalid: i) CZ25123890; ii) CZ1103492745, CZ590312123
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8123,9 +8221,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate German VAT number
-         * Examples:
-         * - Valid: DE136695976
-         * - Invalid: DE136695978
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8143,9 +8238,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Danish VAT number
-         * Example:
-         * - Valid: DK13585628
-         * - Invalid: DK13585627
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8169,9 +8261,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Estonian VAT number
-         * Examples:
-         * - Valid: EE100931558, EE100594102
-         * - Invalid: EE100594103
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8200,12 +8289,8 @@ if (typeof jQuery === 'undefined') {
          * ii) NIE (Número de Identificación de Extranjeros), for foreigners
          * iii) CIF (Certificado de Identificación Fiscal), for legal entities and others
          *
-         * Examples:
-         * - Valid: i) ES54362315K; ii) ESX2482300W, ESX5253868R; iii) ESM1234567L, ESJ99216582, ESB58378431, ESB64717838
-         * - Invalid: i) ES54362315Z; ii) ESX2482300A; iii) ESJ99216583
-         *
          * @param {String} value VAT number
-         * @returns {Boolean}
+         * @returns {Boolean|Object}
          */
         _es: function(value) {
             if (/^ES[0-9A-Z][0-9]{7}[0-9A-Z]$/.test(value)) {
@@ -8259,19 +8344,25 @@ if (typeof jQuery === 'undefined') {
 
             var first = value.charAt(0);
             if (/^[0-9]$/.test(first)) {
-                return dni(value);
+                return {
+                    valid: dni(value),
+                    type: 'DNI'
+                };
             } else if (/^[XYZ]$/.test(first)) {
-                return nie(value);
+                return {
+                    valid: nie(value),
+                    type: 'NIE'
+                };
             } else {
-                return cif(value);
+                return {
+                    valid: cif(value),
+                    type: 'CIF'
+                };
             }
         },
 
         /**
          * Validate Finnish VAT number
-         * Examples:
-         * - Valid: FI20774740
-         * - Invalid: FI20774741
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8297,10 +8388,6 @@ if (typeof jQuery === 'undefined') {
          * Validate French VAT number (TVA - taxe sur la valeur ajoutée)
          * It's constructed by a SIREN number, prefixed by two characters.
          *
-         * Examples:
-         * - Valid: FR40303265045, FR23334175221, FRK7399859412, FR4Z123456782
-         * - Invalid: FR84323140391
-         *
          * @param {String} value VAT number
          * @returns {Boolean}
          */
@@ -8335,9 +8422,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate United Kingdom VAT number
-         * Example:
-         * - Valid: GB980780684
-         * - Invalid: GB802311781
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8392,9 +8476,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Greek VAT number
-         * Examples:
-         * - Valid: GR023456780, EL094259216
-         * - Invalid: EL123456781
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8428,9 +8509,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Hungarian VAT number
-         * Examples:
-         * - Valid: HU12892312
-         * - Invalid: HU12892313
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8455,9 +8533,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Croatian VAT number
-         * Examples:
-         * - Valid: HR33392005961
-         * - Invalid: HR33392005962
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8475,9 +8550,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Irish VAT number
-         * Examples:
-         * - Valid: IE6433435F, IE6433435OA, IE8D79739I
-         * - Invalid: IE8D79738J
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8517,9 +8589,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Icelandic VAT (VSK) number
-         * Examples:
-         * - Valid: 12345, 123456
-         * - Invalid: 1234567
          *
          * @params {String} value VAT number
          * @returns {Boolean}
@@ -8537,10 +8606,6 @@ if (typeof jQuery === 'undefined') {
          * - Next 3 are the province of residence
          * - The last one is a check digit
          *
-         * Examples:
-         * - Valid: IT00743110157
-         * - Invalid: IT00743110158
-         *
          * @param {String} value VAT number
          * @returns {Boolean}
          */
@@ -8570,10 +8635,6 @@ if (typeof jQuery === 'undefined') {
          * - 9 digits, for legal entities
          * - 12 digits, for temporarily registered taxpayers
          *
-         * Examples:
-         * - Valid: LT119511515, LT100001919017, LT100004801610
-         * - Invalid: LT100001919018
-         *
          * @param {String} value VAT number
          * @returns {Boolean}
          */
@@ -8604,9 +8665,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Luxembourg VAT number
-         * Examples:
-         * - Valid: LU15027442
-         * - Invalid: LU15027443
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8624,9 +8682,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Latvian VAT number
-         * Examples:
-         * - Valid: LV40003521600, LV16117519997
-         * - Invalid: LV40003521601, LV16137519997
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8677,9 +8732,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Maltese VAT number
-         * Examples:
-         * - Valid: MT11679112
-         * - Invalid: MT11679113
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8704,9 +8756,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Dutch VAT number
-         * Examples:
-         * - Valid: NL004495445B01
-         * - Invalid: NL123456789B90
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8762,9 +8811,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Polish VAT number
-         * Examples:
-         * - Valid: PL8567346215
-         * - Invalid: PL8567346216
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8789,9 +8835,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Portuguese VAT number
-         * Examples:
-         * - Valid: PT501964843
-         * - Invalid: PT501964842
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8819,9 +8862,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Romanian VAT number
-         * Examples:
-         * - Valid: RO18547290
-         * - Invalid: RO18547291
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8926,9 +8966,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Swedish VAT number
-         * Examples:
-         * - Valid: SE123456789701
-         * - Invalid: SE123456789101
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8947,10 +8984,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Slovenian VAT number
-         * Examples:
-         * - Valid: SI50223054
-         * - Invalid: SI50223055
-         * - Invalid: SI09999990
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -8980,9 +9013,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Slovak VAT number
-         * Examples:
-         * - Valid: SK2022749619
-         * - Invalid: SK2022749618
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -9000,9 +9030,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate Venezuelan VAT number (RIF)
-         * Examples:
-         * - Valid: VEJ309272292, VEV242818101, VEJ000126518, VEJ000458324, J309272292, V242818101, J000126518, J000458324
-         * - Invalid: VEJ309272293, VEV242818100, J000126519, J000458323
          *
          * @param {String} value VAT number
          * @returns {Boolean}
@@ -9038,9 +9065,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate South African VAT number
-         * Examples:
-         * - Valid: 4012345678
-         * - Invalid: 40123456789, 3012345678
          *
          * @params {String} value VAT number
          * @returns {Boolean}
@@ -9073,8 +9097,8 @@ if (typeof jQuery === 'undefined') {
          * - message: The invalid message
          * @returns {Boolean}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'vin');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '') {
                 return true;
             }
@@ -9168,14 +9192,14 @@ if (typeof jQuery === 'undefined') {
          *
          *  callback: function(value, validator, $field) {
          *      // value is the value of field
-         *      // validator is the BootstrapValidator instance
+         *      // validator is the FormValidation.Base instance
          *      // $field is jQuery element representing the field
          *  }
          *
          * @returns {Boolean|Object}
          */
-        validate: function(validator, $field, options) {
-            var value = validator.getFieldValue($field, 'zipCode');
+        validate: function(validator, $field, options, validatorName) {
+            var value = validator.getFieldValue($field, validatorName);
             if (value === '' || !options.country) {
                 return true;
             }
@@ -9318,10 +9342,6 @@ if (typeof jQuery === 'undefined') {
 
         /**
          * Validate United Kingdom postcode
-         * Examples:
-         * - Standard: EC1A 1BB, W1A 1HQ, M1 1AA, B33 8TH, CR2 6XH, DN55 1PT
-         * - Special cases:
-         * AI-2640, ASCN 1ZZ, GIR 0AA
          *
          * @see http://en.wikipedia.org/wiki/Postcodes_in_the_United_Kingdom
          * @param {String} value The postcode