Skip to content

Commit 78e15a3

Browse files
committed
Allow validate/reset multiple scope model
1 parent e16c592 commit 78e15a3

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

dist/angular-validation.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,14 @@
183183
return deferred.promise;
184184
}
185185

186-
if (form.validationId) {
186+
if (form.validationId) { // single
187187
$scope.$broadcast(form.$name + 'submit-' + form.validationId, idx++);
188-
} else {
188+
} else if (form.constructor === Array) { // multiple
189189
for (var k in form) {
190+
$scope.$broadcast(form[k].$name + 'submit-' + form[k].validationId, idx++);
191+
}
192+
} else {
193+
for (var k in form) { // whole scope
190194
if (form[k] && form[k].hasOwnProperty('$dirty')) {
191195
$scope.$broadcast(k + 'submit-' + form[k].validationId, idx++);
192196
}
@@ -233,6 +237,10 @@
233237

234238
if (form.validationId) {
235239
$scope.$broadcast(form.$name + 'reset-' + form.validationId);
240+
} else if (form.constructor === Array) {
241+
for (var k in form) {
242+
$scope.$broadcast(form[k].$name + 'reset-' + form[k].validationId);
243+
}
236244
} else {
237245
for (var k in form) {
238246
if (form[k].hasOwnProperty('$dirty')) {

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: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,14 @@
180180
return deferred.promise;
181181
}
182182

183-
if (form.validationId) {
183+
if (form.validationId) { // single
184184
$scope.$broadcast(form.$name + 'submit-' + form.validationId, idx++);
185-
} else {
185+
} else if (form.constructor === Array) { // multiple
186186
for (var k in form) {
187+
$scope.$broadcast(form[k].$name + 'submit-' + form[k].validationId, idx++);
188+
}
189+
} else {
190+
for (var k in form) { // whole scope
187191
if (form[k] && form[k].hasOwnProperty('$dirty')) {
188192
$scope.$broadcast(k + 'submit-' + form[k].validationId, idx++);
189193
}
@@ -230,6 +234,10 @@
230234

231235
if (form.validationId) {
232236
$scope.$broadcast(form.$name + 'reset-' + form.validationId);
237+
} else if (form.constructor === Array) {
238+
for (var k in form) {
239+
$scope.$broadcast(form[k].$name + 'reset-' + form[k].validationId);
240+
}
233241
} else {
234242
for (var k in form) {
235243
if (form[k].hasOwnProperty('$dirty')) {

0 commit comments

Comments
 (0)