Fix for issue victorjonsson#113, started to work with the html5 module

Author: victorjonsson

README.md

@@ -294,6 +294,12 @@ it calls jQ func **$.formUtils.validateInput** to validate the single input when
 
 ## Changelog
 
+#### 2.2.0 (unreleased)
+* Now possible to define an error message for each validation rule on a certain input (issue #113)
+* This plugin now serves as a html5 fallback. You can now use the native attributes to declare which type
+of validation that should be applied. (**Not yet implemented**)
+
+
 #### 2.1.47
 * Incorrect error-styling when using datepicker or suggestions is now fixed
 * Incorrect error-styling of select elements is now fixed

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.47
+ * @version 2.1.48
  */
 (function($) {
 

form-validator/file.dev.js

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.47
+ * @version 2.1.48
  */
 (function($, window) {
 
@@ -45,6 +45,7 @@
                 $.each(files, function(i, file) {
                     valid = false;
                     mime = file.type || '';
+                    alert(mime);
                     $.each(allowedTypes, function(j, type) {
                         valid = mime.indexOf(type) > -1;
                         if( valid ) {

form-validator/file.js

@@ -317,7 +317,7 @@
 
     $('#text-area').restrictLength($('#max-len'));
 
-    window.applyValidation(true, '#form-a', 'element');
+    window.applyValidation(true, '#form-a', 'top');
     window.applyValidation(false, '#form-b', 'element');
     window.applyValidation(true, '#form-c', $('#error-container'));
 

form-validator/form-test.html

@@ -0,0 +1,100 @@
+/**
+ * jQuery Form Validator Module: html5
+ * ------------------------------------------
+ * Created by Victor Jonsson <http://www.victorjonsson.se>
+ *
+ * The following module will make this jQuery plugin serve as a
+ * html5 fallback. It makes older browsers support the following
+ *  - validation when type="email"
+ *  - validation when type="url"
+ *  - validation when type="number" and max="" min=""
+ *  - validation when pattern="REGEXP"
+ *  - placeholders
+ *
+ * @website http://formvalidator.net/
+ * @license Dual licensed under the MIT or GPL Version 2 licenses
+ * @version 2.1.48
+ */
+(function($, window) {
+
+    "use strict";
+
+    var SUPPORTS_PLACEHOLDER = 'placeholder' in document.createElement('input');
+
+
+    $(window).bind('formValidationSetup', function(evt, $form) {
+        var $formInputs = $form.find('input,textarea,select');
+
+        $formInputs.each(function() {
+            var validation = [],
+                $input = $(this),
+                attrs = {};
+
+            switch ( $input.attr('type').toLowerCase() ) {
+                case 'url':
+                    validation.push('url');
+                    break;
+                case 'email':
+                    validation.push('email');
+                    break;
+                case 'number':
+                    validation.push('number');
+                    var max = $input.attr('max'),
+                        min = $input.attr('min');
+                    if( min || max ) {
+                        if( !min )
+                            min = 0;
+                        if( !max )
+                            max = 9007199254740992; // js max int
+
+                        attrs['data-validation-allowing'] = 'range['+min+';'+max+']';
+                        if( min.indexOf('-') === 0 || max.indexOf('-') === 0 ) {
+                            attrs['data-validation-allowing'] += ',negative';
+                        }
+                        if( min.indexOf('.') > -1 || max.indexOf('.') > -1 ) {
+                            attrs['data-validation-allowing'] += ',float';
+                        }
+                    }
+                    break;
+            }
+
+            if( validation.length == 0 && $input.attr('required') ) {
+                validation.push('required');
+            }
+
+            if( $input.attr('pattern') ) {
+                validation.push('custom');
+                attrs['data-validation-regexp'] = $input.attr('pattern');
+            }
+
+            if( validation.length ) {
+                $input.attr('data-validation', validation.join(' '));
+                $.each(attrs, function(attrName, attrVal) {
+                    $input.attr(attrName, attrVal);
+                });
+            }
+        });
+
+
+        if( !SUPPORTS_PLACEHOLDER ) {
+            $formInputs.filter('input[placeholder]').each(function() {
+                this.defaultValue = this.getAttribute('placeholder');
+                $(this)
+                    .bind('focus', function() {
+                        if(this.value == this.defaultValue) {
+                            this.value = '';
+                            $(this).removeClass('showing-placeholder');
+                        }
+                    })
+                    .bind('blur', function() {
+                        if($.trim(this.value) == '') {
+                            this.value = this.defaultValue;
+                            $(this).addClass('showing-placeholder');
+                        }
+                    });
+            });
+        }
+
+    });
+
+});

form-validator/html5.dev.js

@@ -5,7 +5,7 @@
 *
 * @website http://formvalidator.net/
 * @license Dual licensed under the MIT or GPL Version 2 licenses
-* @version 2.1.47
+* @version 2.1.48
 */
 (function($) {
 
@@ -373,7 +373,6 @@
                     messages += '<br />* ' + mess;
                 });
 
-                // using div instead of P gives better control of css display properties
                 $form.children().eq(0).before('<div class="' + conf.errorMessageClass + ' alert alert-danger">' + messages + '</div>');
             }
 
@@ -486,6 +485,8 @@
 
             var $form  = $(formQuery);
 
+            $(window).trigger('formValidationSetup', [$form]);
+
             // Remove all event listeners previously added
             $form.find('.has-help-txt')
                 .unbind('focus.validation')
@@ -835,11 +836,14 @@
                     }
 
                     if(!isValid) {
-                        validationErrorMsg =  $elem.attr(conf.validationErrorMsgAttribute);
+                        validationErrorMsg =  $elem.attr(conf.validationErrorMsgAttribute+'-'+rule.replace('validate_', ''));
                         if( !validationErrorMsg ) {
-                            validationErrorMsg = language[validator.errorMessageKey];
-                            if( !validationErrorMsg )
-                                validationErrorMsg = validator.errorMessage;
+                            validationErrorMsg =  $elem.attr(conf.validationErrorMsgAttribute);
+                            if( !validationErrorMsg ) {
+                                validationErrorMsg = language[validator.errorMessageKey];
+                                if( !validationErrorMsg )
+                                    validationErrorMsg = validator.errorMessage;
+                            }
                         }
                         return false; // breaks the iteration
                     }
@@ -1492,6 +1496,9 @@
                 }
 
                 if( decimalSeparator == ',' ) {
+                    if( val.indexOf('.') > -1 ) {
+                        return false;
+                    }
                     // Fix for checking range with floats using ,
                     val = val.replace(',', '.');
                 }

form-validator/html5.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.47
+ * @version 2.1.48
  */
 (function($) {