honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(query): the view should not be visible to @Query. 

@ViewQuery is the correct way to query the view template.
This commit is contained in:
Rado Kirov 2015-07-27 15:56:32 -07:00
parent 448ca384cc
commit 1d4502944c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/angular2/src/core/compiler/element_injector.ts
View File

@ -658,11 +658,14 @@ export class ElementInjector extends TreeNode<ElementInjector> implements Depend
} }
private _addViewQueries(host: ElementInjector): void { private _addViewQueries(host: ElementInjector): void {
if (isPresent(host._query0) && host._query0.originator == host) if (isPresent(host._query0) && host._query0.originator == host &&
host._query0.query.isViewQuery)
this._addViewQuery(host._query0); this._addViewQuery(host._query0);
if (isPresent(host._query1) && host._query1.originator == host) if (isPresent(host._query1) && host._query1.originator == host &&
host._query1.query.isViewQuery)
this._addViewQuery(host._query1); this._addViewQuery(host._query1);
if (isPresent(host._query2) && host._query2.originator == host) if (isPresent(host._query2) && host._query2.originator == host &&
host._query2.query.isViewQuery)
this._addViewQuery(host._query2); this._addViewQuery(host._query2);
} }

5
modules/angular2/test/core/compiler/query_integration_spec.ts
View File

@ -397,7 +397,10 @@ class TextDirective {
} }
@Component({selector: 'needs-query'}) @Component({selector: 'needs-query'})
@View({directives: [NgFor], template: '<div *ng-for="var dir of query">{{dir.text}}|</div>'}) @View({
directives: [NgFor, TextDirective],
template: '<div text="ignoreme"></div><div *ng-for="var dir of query">{{dir.text}}|</div>'
})
@Injectable() @Injectable()
class NeedsQuery { class NeedsQuery {
query: QueryList<TextDirective>; query: QueryList<TextDirective>;