Fix for issue victorjonsson#82

victorjonsson · victorjonsson · commit 2f7b3f5956fb · 2014-03-09T11:47:34.000+01:00
diff --git a/README.md b/README.md
@@ -299,6 +299,7 @@ it calls jQ func **$.formUtils.validateInput** to validate the single input when
 * Incorrect error-styling of select elements is now fixed
 * Deprecated function $.validationSetup is now removed, use $.validate() instead
 * You can now return an array with errors using the event `onValidate`
+* You can now declare an element where all error messages should be placed (config.errorMessagePosition)
 
 #### 2.1.36
 * Now possible to use the native reset() function to clear error messages and error styling of the input elements
diff --git a/form-validator/date.dev.js b/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.45
+ * @version 2.1.46
  */
 (function($) {
 
diff --git a/form-validator/file.dev.js b/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.45
+ * @version 2.1.46
  */
 (function($, window) {
 
diff --git a/form-validator/form-test.html b/form-validator/form-test.html
@@ -49,6 +49,17 @@
             color: #999 !important;
         }
 
+        /* Error container for form C */
+
+        #error-container div {
+            color: red;
+            line-height: 140%;
+        }
+
+        #error-container div:last-child {
+            padding-bottom: 10px;
+        }
+
     </style>
 </head>
 <body>
@@ -215,6 +226,10 @@
             <label class="control-label">Country</label>
             <input name="test" data-validation="country" data-validation-error-msg="No valid country given" />
         </div>
+        <div class="form-group">
+            <label class="control-label">E-mail</label>
+            <input name="test" data-validation="email" data-validation-error-msg="E-mail is not valid" />
+        </div>
         <div class="form-group">
             <label class="control-label">Alphanumeric (will only be validated if the checkbox is checked)</label>
             <input name="test2"
@@ -223,6 +238,9 @@
                     data-validation-if-checked="checker" />
             <br />
             <input type="checkbox" name="checker" />
+        </div>
+        <div id="error-container">
+
         </div>
         <p>
             <input type="submit" class="button">
@@ -300,8 +318,8 @@
     $('#text-area').restrictLength($('#max-len'));
 
     window.applyValidation(true);
-    window.applyValidation(false, '#form-b');
-    window.applyValidation(true, '#form-c', 'element');
+    window.applyValidation(false, '#form-b', 'element');
+    window.applyValidation(true, '#form-c', $('#error-container'));
 
     // Load one module outside $.validate() even though you do not have to
     $.formUtils.loadModules('date'+dev+'.js', false, false);
diff --git a/form-validator/jquery.form-validator.js b/form-validator/jquery.form-validator.js
@@ -5,7 +5,7 @@
 *
 * @website http://formvalidator.net/
 * @license Dual licensed under the MIT or GPL Version 2 licenses
-* @version 2.1.45
+* @version 2.1.46
 */
 (function($) {
 
@@ -25,7 +25,7 @@
         },
         _removeErrorStyle = function($elem, conf) {
             $elem.each(function() {
-                _setInlineErrorMessage($(this), '', conf);
+                _setInlineErrorMessage($(this), '', conf, conf.errorMessagePosition);
                 $(this)
                     .removeClass('valid')
                     .removeClass(conf.errorElementClass)
@@ -37,11 +37,32 @@
                             .remove();
             });
         },
-        _setInlineErrorMessage = function($input, mess, conf) {
+        _setInlineErrorMessage = function($input, mess, conf, $messageContainer) {
             var custom = _getInlineErrorElement($input);
             if( custom ) {
                 custom.innerHTML = mess;
-            } else {
+            }
+            else if( typeof $messageContainer == 'object' ) {
+                var $found = false;
+                $messageContainer.find('.'+conf.errorMessageClass).each(function() {
+                    if( this.inputReferer == $input[0] ) {
+                        $found = $(this);
+                        return false;
+                    }
+                });
+                if( $found ) {
+                    if( !mess ) {
+                        $found.remove();
+                    } else {
+                        $found.html(mess);
+                    }
+                } else {
+                    var $mess = $('<div class="'+conf.errorMessageClass+'">'+mess+'</div>');
+                    $mess[0].inputReferer = $input[0];
+                    $messageContainer.prepend($mess);
+                }
+            }
+            else {
                 var $mess = $input.parent().find('.'+conf.errorMessageClass+'.help-block');
                 if( $mess.length == 0 ) {
                     $mess = $('<span></span>').addClass('help-block').addClass(conf.errorMessageClass);
@@ -207,7 +228,7 @@
         } else if(validation !== null) {
 
             _applyErrorStyle($elem, conf);
-            _setInlineErrorMessage($elem, validation, conf);
+            _setInlineErrorMessage($elem, validation, conf, conf.errorMessagePosition);
 
             if(attachKeyupEvent) {
                 $elem.bind('keyup', function() {
@@ -329,7 +350,7 @@
         // Run validation callback
         if( typeof conf.onValidate == 'function' ) {
             var errors = conf.onValidate($form);
-            if($.isArray(errors) ) {
+            if( $.isArray(errors) ) {
                 $.each(errors, function(i, err) {
                     addErrorMessage(err.message, err.element);
                 });
@@ -359,12 +380,13 @@
                 }
             }
 
-            // Display error message below input field
-            else {
+            // Display error message below input field or in defined container
+            else  {
                 $.each(errorInputs, function(i, $input) {
-                    _setInlineErrorMessage($input, $input.attr('current-error'), conf);
+                    _setInlineErrorMessage($input, $input.attr('current-error'), conf, conf.errorMessagePosition);
                 });
             }
+
             return false;
         }
 
diff --git a/form-validator/jquery.form-validator.min.js b/form-validator/jquery.form-validator.min.js
diff --git a/form-validator/location.dev.js b/form-validator/location.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.45
+ * @version 2.1.46
  */
 (function($) {
 
diff --git a/form-validator/security.dev.js b/form-validator/security.dev.js
@@ -12,7 +12,7 @@
  *
  * @website http://formvalidator.net/#security-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.45
+ * @version 2.1.46
  */
 (function($) {
 
diff --git a/form-validator/sweden.dev.js b/form-validator/sweden.dev.js
@@ -13,7 +13,7 @@
  *
  * @website http://formvalidator.net/#swedish-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.45
+ * @version 2.1.46
  */
 (function($, window) {
 
diff --git a/form-validator/uk.dev.js b/form-validator/uk.dev.js
@@ -9,7 +9,7 @@
  *
  * @website http://formvalidator.net/#uk-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.45
+ * @version 2.1.46
  */
 $.formUtils.addValidator({
     name : 'ukvatnumber',

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* @website http://formvalidator.net/#location-validators`
`12`	`12`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`13`		`- * @version 2.1.45`
	`13`	`+ * @version 2.1.46`
`14`	`14`	`*/`
`15`	`15`	`(function($) {`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`* @website http://formvalidator.net/#security-validators`
`14`	`14`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`15`		`- * @version 2.1.45`
	`15`	`+ * @version 2.1.46`
`16`	`16`	`*/`
`17`	`17`	`(function($) {`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`* @website http://formvalidator.net/#swedish-validators`
`15`	`15`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`16`		`- * @version 2.1.45`
	`16`	`+ * @version 2.1.46`
`17`	`17`	`*/`
`18`	`18`	`(function($, window) {`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* @website http://formvalidator.net/#uk-validators`
`11`	`11`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`12`		`- * @version 2.1.45`
	`12`	`+ * @version 2.1.46`
`13`	`13`	`*/`
`14`	`14`	`$.formUtils.addValidator({`
`15`	`15`	`name : 'ukvatnumber',`