Skip to content

Commit 1e00c6c

Browse files
validation sweep rework
1 parent 2a0452b commit 1e00c6c

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

src/mm-form/mm-form.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@
314314
validation = this.config[key].validation,
315315
noValidateFunc = typeof this.config[key].noValidate === 'function',
316316
noValidate = this.config[key].noValidate || false,
317+
field = this.config[key].field,
318+
tagName = this.config[key].field.tagName.toLowerCase(),
317319
valid = false,
318320
value = null;
319321

@@ -332,25 +334,23 @@
332334

333335
if (validation && !noValidate) {
334336
valid = this._validateField(key, value);
337+
} else if (tagName === 'mm-repeater') {
338+
// special case for mm-repeater
339+
// mm-repeater will handle it's own validation
340+
// TODO: Make sure mm-repeater returns something
341+
valid = field.validate();
342+
} else if (validation && noValidate) {
343+
// clean up prior validations if they were there
344+
this.resetFieldValidation(key);
345+
}
335346

336-
// Store valid and invalid for this validation pass
347+
// Store valid and invalid for this validation pass
348+
if (validation && !noValidate || tagName === 'mm-repeater' && !noValidate) {
337349
if (valid) {
338350
this._validFields.push(key);
339351
} else {
340352
this._invalidFields.push(key);
341353
}
342-
} else if (validation && noValidate) {
343-
// clean up prior validations if they were there
344-
this.resetFieldValidation(key);
345-
} else {
346-
// special case for mm-repeater
347-
// mm-repeater will handle it's own validation
348-
var field = this.config[key].field,
349-
tagName = field.tagName.toLowerCase();
350-
351-
if (tagName === 'mm-repeater') {
352-
field.validate();
353-
}
354354
}
355355

356356
// show messaging in the footer

0 commit comments

Comments
 (0)