adjustedConflicts = {};
conflicts.forEach( function ( conflict ) {
+ var filter;
+
if ( conflict.filter ) {
filterName = model.groups[ conflict.group ].getNamePrefix() + conflict.filter;
+ filter = model.getItemByName( filterName );
// Rename
adjustedConflicts[ filterName ] = $.extend(
{},
conflict,
- { filter: filterName }
+ {
+ filter: filterName,
+ item: filter
+ }
);
} else {
// This conflict is for an entire group. Split it up to
adjustedConflicts[ groupItem.getName() ] = $.extend(
{},
conflict,
- { filter: groupItem.getName() }
+ {
+ filter: groupItem.getName(),
+ item: groupItem
+ }
);
} );
}
}
} );
+ // Add items to the model
+ this.addItems( items );
+
// Expand conflicts
groupConflictResult = expandConflictDefinitions( groupConflictMap );
filterConflictResult = expandConflictDefinitions( filterConflictMap );
}
} );
- // Add items to the model
- this.addItems( items );
-
this.emit( 'initialize' );
};