Fix checkValid error

hueitan · Oct 21, 2015 · 465263f · 465263f
1 parent 6f9403d
commit 465263f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -160,10 +160,7 @@
              * @returns {boolean}
              */
             this.checkValid = function(form) {
-                if (form.$valid === undefined) {
-                    return false;
-                }
-                return (form && form.$valid === true);
+                return !!(form && form.$valid);
             };
 
 

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/provider.js b/src/provider.js
@@ -156,10 +156,7 @@
              * @returns {boolean}
              */
             this.checkValid = function(form) {
-                if (form.$valid === undefined) {
-                    return false;
-                }
-                return (form && form.$valid === true);
+                return !!(form && form.$valid);
             };
 
 

diff --git a/test/unit/providerSpec.js b/test/unit/providerSpec.js
@@ -99,6 +99,9 @@ describe('provider', function() {
         expect(validationProvider.checkValid($scope.Form)).toBe(true);
         $scope.Form.required.$setViewValue('');
         expect(validationProvider.checkValid($scope.Form)).toBe(false);
+        delete $scope.Form;
+        expect(validationProvider.checkValid($scope.Form)).toBe(false);
+        expect(validationProvider.checkValid()).toBe(false);
     }));
 
     it('reset', inject(function() {