Fix validations

anatoliychakkaev · Mar 31, 2013 · 6449f1c · 6449f1c
1 parent 0776c51
commit 6449f1c
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/lib/validations.js b/lib/validations.js
@@ -374,15 +374,22 @@ Validatable.prototype.isValid = function (callback, data) {
         });
 
         if (!async) {
-            validationsDone.call(inst, callback);
+            validationsDone.call(inst, function() {
+                if (valid) cleanErrors(inst);
+                if (callback) {
+                    callback(valid);
+                }
+            });
         }
 
         function done(fail) {
             asyncFail = asyncFail || fail;
-            if (--wait === 0 && callback) {
+            if (--wait === 0) {
                 validationsDone.call(inst, function () {
                     if (valid && !asyncFail) cleanErrors(inst);
-                    callback(valid && !asyncFail);
+                    if (callback) {
+                        callback(valid && !asyncFail);
+                    }
                 });
             }
         }