TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LT-67: Re-validating fields on change only if the form validation has already been called

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-09-09 08:50:53 -03:00
parent c6690781f8
commit 92728c4100
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Packages/ohif-core/client/components/base/mixins/form.js
View File

@ -17,6 +17,9 @@ OHIF.mixins.form = new OHIF.Mixin({
// Set the form identifier flag // Set the form identifier flag
component.isForm = true; component.isForm = true;
// Set the form validated flag
component.isValidatedAlready = false;
component.validationObserver = new Tracker.Dependency(); component.validationObserver = new Tracker.Dependency();
// Reset the pathKey // Reset the pathKey
@ -34,6 +37,9 @@ OHIF.mixins.form = new OHIF.Mixin({
// Call the original validation function // Call the original validation function
validateSelf(); validateSelf();
// Change the form validated flag to true
component.isValidatedAlready = true;
// Focus the first error field if some validation failed // Focus the first error field if some validation failed
if (component.schema && component.schema._invalidKeys.length) { if (component.schema && component.schema._invalidKeys.length) {
instance.$('.state-error :input:first').focus(); instance.$('.state-error :input:first').focus();

7
Packages/ohif-core/client/components/base/mixins/formItem.js
View File

@ -235,8 +235,11 @@ OHIF.mixins.formItem = new OHIF.Mixin({
// Enable reactivity by changing a Tracker.Dependency observer // Enable reactivity by changing a Tracker.Dependency observer
component.changeObserver.changed(); component.changeObserver.changed();
// Revalidate the component const form = component.getForm();
component.validate(); if (form && form.isValidatedAlready) {
// Revalidate the component if form is already validated
component.validate();
}
} }
}, },