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

feat(core): view engine - support content projection (#14209)

Browse Source 
Part of #14013

PR Close #14209
This commit is contained in:
Tobias Bosch
2017-01-31 08:51:42 -08:00
committed by Miško Hevery
parent 86b2b2504f
commit 0a29574d98
24 changed files with 545 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/@angular/core/src/view/element.ts
View File

@ -13,8 +13,8 @@ import {BindingDef, BindingType, DebugContext, DisposableFn, ElementData, Elemen
import {checkAndUpdateBinding, entryAction, setBindingDebugInfo, setCurrentNode, sliceErrorStack} from './util';
export function anchorDef(
flags: NodeFlags, matchedQueries: [string, QueryValueType][], childCount: number,
template?: ViewDefinition): NodeDef {
flags: NodeFlags, matchedQueries: [string, QueryValueType][], ngContentIndex: number,
childCount: number, template?: ViewDefinition): NodeDef {
const matchedQueryDefs: {[queryId: string]: QueryValueType} = {};
if (matchedQueries) {
matchedQueries.forEach(([queryId, valueType]) => { matchedQueryDefs[queryId] = valueType; });
@ -33,7 +33,7 @@ export function anchorDef(
disposableIndex: undefined,
// regular values
flags,
matchedQueries: matchedQueryDefs, childCount,
matchedQueries: matchedQueryDefs, ngContentIndex, childCount,
bindings: [],
disposableCount: 0,
element: {
@ -41,18 +41,19 @@ export function anchorDef(
attrs: undefined,
outputs: [], template,
// will bet set by the view definition
providerIndices: undefined, source
providerIndices: undefined, source,
},
provider: undefined,
text: undefined,
pureExpression: undefined,
query: undefined,
ngContent: undefined
};
}
export function elementDef(
flags: NodeFlags, matchedQueries: [string, QueryValueType][], childCount: number, name: string,
fixedAttrs: {[name: string]: string} = {},
flags: NodeFlags, matchedQueries: [string, QueryValueType][], ngContentIndex: number,
childCount: number, name: string, fixedAttrs: {[name: string]: string} = {},
bindings?:
([BindingType.ElementClass, string] | [BindingType.ElementStyle, string, string] |
[BindingType.ElementAttribute | BindingType.ElementProperty, string, SecurityContext])[],
@ -108,7 +109,7 @@ export function elementDef(
disposableIndex: undefined,
// regular values
flags,
matchedQueries: matchedQueryDefs, childCount,
matchedQueries: matchedQueryDefs, ngContentIndex, childCount,
bindings: bindingDefs,
disposableCount: outputDefs.length,
element: {
@ -117,12 +118,13 @@ export function elementDef(
outputs: outputDefs,
template: undefined,
// will bet set by the view definition
providerIndices: undefined, source
providerIndices: undefined, source,
},
provider: undefined,
text: undefined,
pureExpression: undefined,
query: undefined,
ngContent: undefined
};
}