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

feat(ElementInjector): change ElementInjector so @parent and @ancestor do not include self.

This commit is contained in:
vsavkin 2014-11-14 09:20:32 -08:00
parent b87891d77c
commit ac8351b7bc
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/core/src/compiler/element_injector.js
View File

@ -377,6 +377,12 @@ export class ElementInjector extends TreeNode {
*/
_getByKey(key:Key, depth:int, requestor:Key) {
var ei = this;
if (! this._shouldIncludeSelf(depth)) {
depth -= 1;
ei = ei._parent;
}
while (ei != null && depth >= 0) {
var specObj = ei._getSpecialObjectByKeyId(key.id);
if (specObj !== _undefined) return specObj;
@ -387,6 +393,7 @@ export class ElementInjector extends TreeNode {
ei = ei._parent;
depth -= 1;
}
if (isPresent(this._host) && this._host._isComponentKey(key)) {
return this._host.getComponent();
} else {
@ -400,6 +407,10 @@ export class ElementInjector extends TreeNode {
}
}
_shouldIncludeSelf(depth:int) {
return depth === 0;
}
_getSpecialObjectByKeyId(keyId:int) {
var staticKeys = StaticKeys.instance();
if (keyId === staticKeys.viewId) return this._view;

6
modules/core/test/compiler/element_injector_spec.js
View File

@ -225,6 +225,12 @@ export function main() {
expect(d.dependency).toBeAnInstanceOf(Directive);
});
it("should not return parent's directives on self", function () {
expect(() => {
injector([Directive, NeedDirectiveFromParent]);
}).toThrowError();
});
it("should get directives from ancestor", function () {
var child = parentChildInjectors([Directive], [NeedDirectiveFromAncestor]);