Skip to content

Commit 0d51d3f

Browse files
hueitanhueitan
committed
Support angularjs > 1.3.0 version and fix bug (don't use validator name start with $)
1 parent e1e6de4 commit 0d51d3f

10 files changed

Lines changed: 8550 additions & 4870 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Client-side Validation should be simple and clean.
1212

1313
Requirement
1414
-----
15-
[AngularJS](http://angularjs.org) > 1.2.0, 1.3.0-beta
15+
[AngularJS](http://angularjs.org) > 1.2.0, > 1.3.0
1616

1717
DEMO
1818
-----

‎config/karma.conf.angular.1.3.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ module.exports = function(config) {
77

88
// list of files / patterns to load in the browser
99
files: [
10-
'test/lib/angular.1.3.0-beta.5.js',
11-
'test/lib/angular-mocks.1.3.0-beta.5.js',
10+
'test/lib/angular.1.3.1.js',
11+
'test/lib/angular-mocks.1.3.1.js',
1212
'dist/angular-validation.js',
1313
'dist/angular-validation-rule.js',
1414
'test/unit/*.js'

‎dist/angular-validation.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
}
193193
} else {
194194
for (var i in form) { // whole scope
195-
if (form[i] && form[i].hasOwnProperty('$dirty')) {
195+
if (i[0] !== '$' && form[i].hasOwnProperty('$dirty')) {
196196
$scope.$broadcast(i + 'submit-' + form[i].validationId, idx++);
197197
}
198198
}
@@ -229,7 +229,6 @@
229229
* @param form
230230
*/
231231
this.reset = function(form) {
232-
233232
if (form === undefined) {
234233
console.error('This is not a regular Form name scope');
235234
return;
@@ -243,7 +242,7 @@
243242
}
244243
} else {
245244
for (var i in form) {
246-
if (form[i].hasOwnProperty('$dirty')) {
245+
if (i[0] !== '$' && form[i].hasOwnProperty('$dirty')) {
247246
$scope.$broadcast(i + 'reset-' + form[i].validationId);
248247
}
249248
}

‎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.

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ <h1>Angular Validation.
211211
</div>
212212

213213
<a href="https://github.com/huei90/angular-validation"><img src="demo/iconmonstr-github-10-icon-128.png" id="github-link" alt="Fork me on Github"/></a>
214-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.25/angular.min.js"></script>
214+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.1/angular.min.js"></script>
215215
<script src="dist/angular-validation.js"></script>
216216
<script src="dist/angular-validation-rule.js"></script>
217217
<script src="demo/demo.js"></script>

‎src/provider.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
}
189189
} else {
190190
for (var i in form) { // whole scope
191-
if (form[i] && form[i].hasOwnProperty('$dirty')) {
191+
if (i[0] !== '$' && form[i].hasOwnProperty('$dirty')) {
192192
$scope.$broadcast(i + 'submit-' + form[i].validationId, idx++);
193193
}
194194
}
@@ -225,7 +225,6 @@
225225
* @param form
226226
*/
227227
this.reset = function(form) {
228-
229228
if (form === undefined) {
230229
console.error('This is not a regular Form name scope');
231230
return;
@@ -239,7 +238,7 @@
239238
}
240239
} else {
241240
for (var i in form) {
242-
if (form[i].hasOwnProperty('$dirty')) {
241+
if (i[0] !== '$' && form[i].hasOwnProperty('$dirty')) {
243242
$scope.$broadcast(i + 'reset-' + form[i].validationId);
244243
}
245244
}

0 commit comments

Comments
 (0)