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

LT-67: Fixing change event bubbling on formItem mixin

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-08-31 13:57:22 -03:00
parent 6e84a388b6
commit c4ac8cbeef
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,9 +160,18 @@ OHIF.mixins.formItem = new OHIF.Mixin({
events: { events: {
// Enable reactivity by changing a Tracker.Dependency observer // Handle the change event for the component
change(event, instance) { change(event, instance) {
instance.component.changeObserver.changed(); const component = instance.component;
// Prevent execution on upper components
if (event.currentTarget === component.$element[0]) {
// Enable reactivity by changing a Tracker.Dependency observer
component.changeObserver.changed();
// Revalidate the component
component.validate();
}
}, },
// TODO: [design] remove log, show error box/hint over the wrapper // TODO: [design] remove log, show error box/hint over the wrapper

1
Packages/ohif-core/client/components/base/mixins/schemaData.js
View File

@ -30,7 +30,6 @@ const getCurrentSchema = (parentComponent, key) => {
// Merge the sub-schema properties if it's an array // Merge the sub-schema properties if it's an array
if (Array.isArray(currentSchema.type())) { if (Array.isArray(currentSchema.type())) {
console.warn('>>>>IS ARRAY', currentSchema);
_.extend(currentSchema, schema._schema[key + '.$']); _.extend(currentSchema, schema._schema[key + '.$']);
} }