Fixed issues victorjonsson#71, victorjonsson#76, victorjonsson#75 and v…

…ictorjonsson#77
ivcreative · Jan 11, 2014 · 9fecbe1 · 9fecbe1
1 parent 6aadda7
commit 9fecbe1
Show file tree

Hide file tree

Showing 11 changed files with 158 additions and 135 deletions.
diff --git a/README.md b/README.md
@@ -294,6 +294,9 @@ it calls jQ func **$.formUtils.validateInput** to validate the single input when
 
 ## Changelog
 
+#### 3.1.36
+* Now possible to use the native reset() function to clear error messages and error styling of the input elements
+
 #### 2.1.34
 * General improvements and bug fixes
 * Added events "beforeValidation" and "validation" (see http://formvalidator.net/#configuration_callbacks for more info)

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.35
+ * @version 2.1.36
  */
 (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.35
+ * @version 2.1.36
  */
 (function($, window) {
 

diff --git a/form-validator/form-test.html b/form-validator/form-test.html
@@ -44,24 +44,28 @@
             margin-left: 10px;
         }
 
+        span.help {
+            color: #999 !important;
+        }
+
     </style>
 </head>
 <body>
 <div>
-    <form action="" id="test-form" role="form">
+    <form action="" id="form-a" role="form">
         <div class="form-group">
             <label class="control-label" for="inline-suggestions">Inline suggestions</label>
             <input name="inline suggestions" type="text" id="inline-suggestions" class="form-control" data-suggestions="Monkey, Horse, Fox, Tiger, Elephant" />
         </div>
 
         <div class="form-group">
             <label class="control-label" for="country-suggestions">Country suggestions</label>
-            <input name="country suggestions" type="text" id="country-suggestions" class="form-control" />
+            <input name="country suggestions" data-validation="country" type="text" id="country-suggestions" class="form-control" />
         </div>
 
         <div class="form-group">
             <label class="control-label" for="country-suggestions">Swedish county suggestions</label>
-            <input name="Swedish county suggestion" type="text" id="swedish-county-suggestions" class="form-control" />
+            <input name="Swedish county suggestion" data-validation="swecounty" type="text" id="swedish-county-suggestions" class="form-control" />
         </div>
 
         <div class="form-group password-strength">
@@ -147,6 +151,29 @@
         </div>
         <p>
             <input type="submit" class="button">
+            <input type="reset" class="button">
+        </p>
+    </form>
+    <hr />
+    <form id="form-b">
+        <div class="form-group">
+            <label class="control-label">Test</label>
+            <input name="test" data-validation="number" type="text" />
+        </div>
+        <p>
+            <input type="submit" class="button">
+            <input type="reset" class="button">
+        </p>
+    </form>
+    <hr />
+    <form id="form-c">
+        <div class="form-group">
+            <label class="control-label">Country</label>
+            <input name="test" data-validation="country" data-validation-error-msg="No valid country given" />
+        </div>
+        <p>
+            <input type="submit" class="button">
+            <input type="reset" class="button">
         </p>
     </form>
 </div>
@@ -169,21 +196,31 @@
         errorMessageKey: 'badEvenNumber'
     });
 
-    window.applyValidation = function() {
+    window.applyValidation = function(validateOnBlur, forms, messagePosition) {
+        if( !forms )
+            forms = 'form';
+        if( !messagePosition )
+            messagePosition = 'top';
+
         $.validate({
+            form : forms,
             language : {
                 requiredFields: 'Du måste bocka för denna'
             },
-            errorMessagePosition : 'top',
+            validateOnBlur : validateOnBlur,
+            errorMessagePosition : messagePosition,
             scrollToTopOnError : true,
+            borderColorOnError : 'purple',
             modules : 'security'+dev+', location'+dev+', sweden'+dev+', file'+dev+', uk'+dev,
-            onModulesLoaded: function( $form ) {
+            onModulesLoaded: function() {
                 $('#country-suggestions').suggestCountry();
                 $('#swedish-county-suggestions').suggestSwedishCounty();
                 $('#password').displayPasswordStrength();
             },
-            onValidate : function() {
-                console.log('wii');
+            onValidate : function($f) {
+
+                console.log('about to validate form '+$f.attr('id'));
+
                 var $callbackInput = $('#callback');
                 if( $callbackInput.val() == 1 ) {
                     return {
@@ -192,19 +229,21 @@
                     };
                 }
             },
-            onError : function() {
+            onError : function($form) {
                 if( !$.formUtils.haltValidation ) {
-                    alert('Invalid');
+                    alert('Invalid '+$form.attr('id'));
                 }
             },
-            onSuccess : function() {
-                alert('Valid');
+            onSuccess : function($form) {
+                alert('Valid '+$form.attr('id'));
                 return false;
             }
         });
     };
 
-    window.applyValidation();
+    window.applyValidation(true);
+    window.applyValidation(false, '#form-b');
+    window.applyValidation(true, '#form-c', 'element');
 
     // Load one module outside $.validate() even though you do not have to
     $.formUtils.loadModules('date'+dev+'.js', false, false);