Fixed bug victorjonsson#49 and victorjonsson#50

Author: victorjonsson

README.md

@@ -294,6 +294,12 @@ it calls jQ func **$.formUtils.validateInput** to validate the single input when
 
 ## Changelog
 
+
+### 2.1.15
+ * E-mail addresses can now contain + symbol
+ * Correction of the US states in validation "federatestate"
+ * Fixed bug in server validation
+
 ### 2.1.9
  * File validation now support multiple files
  * Length validation can now be used to validate the number of uploaded files using a file input that supports multiple files

form-validator/date.dev.js

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.9
+ * @version 2.1.15
  */
 (function($) {
 

form-validator/date.js

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.9
+ * @version 2.1.15
  */
 (function($, window) {
 

form-validator/file.dev.js

@@ -88,7 +88,7 @@
             <label class="control-label">Server validation</label>
             <input class="form-control" name="code"
                    data-validation-help="The word is &quot;secret&quot;"
-                   data-validation="server"
+                   data-validation="alphanumeric server"
                    data-validation-url="http://formvalidator.net/validate-email.php" />
         </div>
 
@@ -190,6 +190,7 @@
     $.formUtils.addValidator({
         name : 'even_number',
         validatorFunction : function(value, $el, config, language, $form) {
+            console.log('Event number');
             return parseInt(value, 10) % 2 === 0;
         },
         borderColorOnError : '',

form-validator/file.js

@@ -5,7 +5,7 @@
 *
 * @website http://formvalidator.net/
 * @license Dual licensed under the MIT or GPL Version 2 licenses
-* @version 2.1.9
+* @version 2.1.15
 */
 (function($) {
 
@@ -79,12 +79,14 @@
     * @param {Object} [language] Optional, will override $.formUtils.LANG
     * @param {Object} [config] Optional, will override the default settings
     * @param {Boolean} [attachKeyupEvent] Optional
+    * @param {String} [eventContext]
     * @return {jQuery}
     */
-    $.fn.validateInputOnBlur = function(language, config, attachKeyupEvent) {
-        if(attachKeyupEvent === undefined) {
+    $.fn.validateInputOnBlur = function(language, config, attachKeyupEvent, eventContext) {
+        if(attachKeyupEvent === undefined)
             attachKeyupEvent = true;
-        }
+        if(!eventContext)
+            eventContext = 'blur';
 
         language = $.extend($.formUtils.LANG, language || {});
         config = $.extend($.formUtils.defaultConfig(), config || {});
@@ -99,11 +101,6 @@
 
             validationRule = $element.attr(config.validationRuleAttribute);
 
-        if( !attachKeyupEvent && validationRule == 'server' ) {
-            // do not validate server side on keyup event
-            return this;
-        }
-
         // Remove possible error style applied by previous validation
         $element
             .removeClass(config.errorElementClass)
@@ -113,13 +110,14 @@
 
         // Twitter bs
         $form.find('.has-error').removeClass('has-error');
+        $element.removeClass('valid').parent().removeClass('has-success');
 
         // if element has custom err msg container, clear it
         if( elementErrMsgObj != null) {
             elementErrMsgObj.innerHTML = '';
         }
 
-        var validation = $.formUtils.validateInput($element, language, config, $form);
+        var validation = $.formUtils.validateInput($element, language, config, $form, eventContext);
 
         if(validation === true) {
             $element
@@ -155,7 +153,7 @@
 
             if(attachKeyupEvent) {
                 $element.bind('keyup', function() {
-                    $(this).validateInputOnBlur(language, config, false);
+                    $(this).validateInputOnBlur(language, config, false, 'keyup');
                 });
             }
         }
@@ -253,7 +251,8 @@
                                 $element,
                                 language,
                                 config,
-                                $form
+                                $form,
+                                'submit'
                             );
 
                 if(validation !== true) {
@@ -533,6 +532,8 @@
         addValidator : function(validator) {
             // prefix with "validate_" for backward compatibility reasons
             var name = validator.name.indexOf('validate_') === 0 ? validator.name : 'validate_'+validator.name;
+            if( validator.validateOnKeyUp === undefined )
+                validator.validateOnKeyUp = true;
             this.validators[name] = validator;
         },
 
@@ -672,9 +673,10 @@
         * @param {Object} language ($.formUtils.LANG)
         * @param {Object} config
         * @param {jQuery} $form
+        * @param {String} [eventContext]
         * @return {String|Boolean}
         */
-        validateInput : function($element, language, config, $form) {
+        validateInput : function($element, language, config, $form, eventContext) {
 
             var value = $.trim( $element.val() || ''),
                 optional = $element.valAttr('optional'),
@@ -734,7 +736,10 @@
                             $element = $("[name='"+$element.attr('name')+"']:eq(0)");
                     }
 
-                    var isValid = validator.validatorFunction(value, $element, config, language, $form);
+                    var isValid = true;
+                    if( eventContext != 'keyup' || validator.validateOnKeyUp ) {
+                        isValid = validator.validatorFunction(value, $element, config, language, $form);
+                    }
 
                     if(!isValid) {
                         validationErrorMsg =  $element.attr(config.validationErrorMsgAttribute);
@@ -745,6 +750,7 @@
                         }
                         return false; // breaks the iteration
                     }
+
                 } else {
                     console.warn('Using undefined validator "'+rule+'"');
                 }
@@ -1142,13 +1148,13 @@
     $.formUtils.addValidator({
         name : 'email',
         validatorFunction : function(email) {
-            var emailFilter = /^([a-zA-Z0-9_\.\-])+@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-            if(emailFilter.test(email)) {
-               var parts = email.split('@');
-               if(parts.length == 2) {
-                   return $.formUtils.validators.validate_domain.validatorFunction(parts[1]);
-               }
+
+            var emailParts = email.split('@');
+            if( emailParts.length == 2 ) {
+                return $.formUtils.validators.validate_domain.validatorFunction(emailParts[1]) &&
+                        !(/[^a-zA-Z0-9_\+\.\-]/.test(emailParts[0]));
             }
+
             return false;
         },
         errorMessage : '',

form-validator/form-test.html

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.9
+ * @version 2.1.15
  */
 (function($) {
 
@@ -35,7 +35,7 @@
         validatorFunction : function(str) {
             return $.inArray(str.toLowerCase(), this.states) > -1;
         },
-        states : ['alabama','alaska','arkansas','california','colorado','connecticut','delaware','florida','georgia','hawaii','idaho','illinois','indiana','iowa','kansas','kentucky','louisiana','maine','marylan ','massachusetts','michigan','minnesota','mississippi','missouri','montana','nebraska','nevada','new hampshire','new jersey','new mexico','new york','north carolina','north dakota','ohio','oklahoma','oregon','pennsylvania','rhode island','south carolina','south dakota','tennessee','texas','utah','vermont','virginia','washington','west virginia','wisconsin','wyoming'],
+        states : ['alabama','alaska', 'arizona', 'arkansas','california','colorado','connecticut','delaware','florida','georgia','hawaii','idaho','illinois','indiana','iowa','kansas','kentucky','louisiana','maine','maryland', 'district of columbia', 'massachusetts','michigan','minnesota','mississippi','missouri','montana','nebraska','nevada','new hampshire','new jersey','new mexico','new york','north carolina','north dakota','ohio','oklahoma','oregon','pennsylvania','rhode island','south carolina','south dakota','tennessee','texas','utah','vermont','virginia','washington','west virginia','wisconsin','wyoming'],
         errorMessage : '',
         errorMessageKey: 'badCustomVal'
     });