Skip to content

Commit 09aed2e

Browse files
committed
Merge pull request #145 from lvarayut/master
Fix checkValid error
2 parents 6f9403d + 465263f commit 09aed2e

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

dist/angular-validation.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,7 @@
160160
* @returns {boolean}
161161
*/
162162
this.checkValid = function(form) {
163-
if (form.$valid === undefined) {
164-
return false;
165-
}
166-
return (form && form.$valid === true);
163+
return !!(form && form.$valid);
167164
};
168165

169166

dist/angular-validation.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/provider.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,7 @@
156156
* @returns {boolean}
157157
*/
158158
this.checkValid = function(form) {
159-
if (form.$valid === undefined) {
160-
return false;
161-
}
162-
return (form && form.$valid === true);
159+
return !!(form && form.$valid);
163160
};
164161

165162

test/unit/providerSpec.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ describe('provider', function() {
9999
expect(validationProvider.checkValid($scope.Form)).toBe(true);
100100
$scope.Form.required.$setViewValue('');
101101
expect(validationProvider.checkValid($scope.Form)).toBe(false);
102+
delete $scope.Form;
103+
expect(validationProvider.checkValid($scope.Form)).toBe(false);
104+
expect(validationProvider.checkValid()).toBe(false);
102105
}));
103106

104107
it('reset', inject(function() {

0 commit comments

Comments
 (0)