cargdev/angular
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): support read option when querying for types (#21187)

Browse Source 
PR Close #21187
This commit is contained in:
Pawel Kozlowski
2017-12-20 12:19:59 +01:00
committed by Miško Hevery
parent a62371c0eb
commit afd89ed8d9
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/src/render3/query.ts
View File

@ -154,6 +154,7 @@ function getIdxOfMatchingSelector(staticData: LNodeStatic, selector: string): nu
}
function add(predicate: QueryPredicate<any>| null, node: LNode) {
const nodeInjector = getOrCreateNodeInjectorForNode(node as LElement | LContainer);
while (predicate) {
const type = predicate.type;
if (type) {
@ -164,18 +165,21 @@ function add(predicate: QueryPredicate<any>| null, node: LNode) {
i < ii; i++) {
const def = ngStaticData[i] as DirectiveDef<any>;
if (def.diPublic && def.type === type) {
predicate.values.push(node.view.data[i]);
if (predicate.read !== null) {
predicate.values.push(readFromNodeInjector(nodeInjector, node, predicate.read));
} else {
predicate.values.push(node.view.data[i]);
}
}
}
} else {
const nodeInjector = getOrCreateNodeInjectorForNode(node as LElement | LContainer);
const selector = predicate.selector !;
for (let i = 0; i < selector.length; i++) {
ngDevMode && assertNotNull(node.staticData, 'node.staticData');
const directiveIdx = getIdxOfMatchingSelector(node.staticData !, selector[i]);
// is anything on a node matching a selector?
if (directiveIdx !== null) {
if (predicate.read != null) {
if (predicate.read !== null) {
predicate.values.push(readFromNodeInjector(nodeInjector, node, predicate.read));
} else {
// is local name pointing to a directive?