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

Ignoring action components when using arrays on group mixin

Browse Source
This commit is contained in:
Bruno Alves de Faria 2017-10-04 16:04:31 -03:00
parent 9611fb5963
commit f19ef98f5f
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Packages/ohif-core/client/components/base/mixins/group.js
View File

@ -44,6 +44,12 @@ OHIF.mixins.group = new OHIF.Mixin({
component.registeredItems.forEach(child => { component.registeredItems.forEach(child => {
// Check if it is an array or an object group // Check if it is an array or an object group
if (isArray) { if (isArray) {
// Get the mixins array
const mixins = child.templateInstance.data.mixins.split(' ');
// Prevent reading action components
if (mixins.indexOf('action') > -1) return;
// Push the item value to the result array // Push the item value to the result array
result.push(child.value()); result.push(child.value());
} else { } else {
@ -73,6 +79,11 @@ OHIF.mixins.group = new OHIF.Mixin({
// Iterate over each registered item and set its value // Iterate over each registered item and set its value
let i = 0; let i = 0;
component.registeredItems.forEach(child => { component.registeredItems.forEach(child => {
const mixins = child.templateInstance.data.mixins.split(' ');
// Prevent reading action components
if (isArray && mixins.indexOf('action') > -1) return;
const key = isArray ? i : child.templateInstance.data.key; const key = isArray ? i : child.templateInstance.data.key;
const childValue = _.isUndefined(groupValue[key]) ? null : groupValue[key]; const childValue = _.isUndefined(groupValue[key]) ? null : groupValue[key];
child.value(childValue); child.value(childValue);