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

fix(ng-content): wildcard ng-content has to go last.

Browse Source 
This was the case before the new compiler landed and should be preserved. 

Related to #4598
Closes #5016
This commit is contained in:
Tobias Bosch 2015-10-29 16:23:13 -07:00
parent d1b54d6807
commit 39626a944d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/angular2/src/core/compiler/template_parser.ts
View File

@ -655,12 +655,12 @@ class Component {
findNgContentIndex(selector: CssSelector): number { findNgContentIndex(selector: CssSelector): number {
var ngContentIndices = []; var ngContentIndices = [];
if (isPresent(this.wildcardNgContentIndex)) {
ngContentIndices.push(this.wildcardNgContentIndex);
}
this.ngContentIndexMatcher.match( this.ngContentIndexMatcher.match(
selector, (selector, ngContentIndex) => { ngContentIndices.push(ngContentIndex); }); selector, (selector, ngContentIndex) => { ngContentIndices.push(ngContentIndex); });
ListWrapper.sort(ngContentIndices); ListWrapper.sort(ngContentIndices);
if (isPresent(this.wildcardNgContentIndex)) {
ngContentIndices.push(this.wildcardNgContentIndex);
}
return ngContentIndices.length > 0 ? ngContentIndices[0] : null; return ngContentIndices.length > 0 ? ngContentIndices[0] : null;
} }
} }

6
modules/angular2/test/core/compiler/template_parser_spec.ts
View File

@ -754,6 +754,12 @@ There is no directive with "exportAs" set to "dirA" at TestComp > div:nth-child(
.toEqual([['div', null], ['#text(hello)', 2], ['b', 1], ['a', 0]]); .toEqual([['div', null], ['#text(hello)', 2], ['b', 1], ['a', 0]]);
}); });
it('should project into wildcard ng-content last', () => {
expect(humanizeContentProjection(
parse('<div>hello<a></a></div>', [createComp('div', ['*', 'a'])])))
.toEqual([['div', null], ['#text(hello)', 0], ['a', 1]]);
});
it('should only project direct child nodes', () => { it('should only project direct child nodes', () => {
expect(humanizeContentProjection( expect(humanizeContentProjection(
parse('<div><span><a></a></span><a></a></div>', [createComp('div', ['a'])]))) parse('<div><span><a></a></span><a></a></div>', [createComp('div', ['a'])])))