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

fix(view): ViewPort light should come from the direct parent

Browse Source
This commit is contained in:
Victor Berchet
2015-02-10 18:37:47 +01:00
parent b953956a35
commit fc1b791a7a
4 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/angular2/src/core/compiler/element_injector.js vendored
View File

@ -261,6 +261,10 @@ export class ProtoElementInjector {
return new ElementInjector(this, parent, host, eventCallbacks);
}
directParent(): ProtoElementInjector {
return this.distanceToParent < 2 ? this.parent : null;
}
_createBinding(bindingOrType) {
if (bindingOrType instanceof DirectiveBinding) {
return bindingOrType;

6
modules/angular2/src/core/compiler/view.js vendored
View File

@ -401,7 +401,7 @@ export class ProtoView {
// viewPorts
var viewPort = null;
if (isPresent(binder.templateDirective)) {
var destLightDom = this._parentElementLightDom(protoElementInjector, preBuiltObjects);
var destLightDom = this._directParentElementLightDom(protoElementInjector, preBuiltObjects);
viewPort = new ViewPort(view, element, binder.nestedProtoView, elementInjector, destLightDom);
ListWrapper.push(viewPorts, viewPort);
}
@ -456,8 +456,8 @@ export class ProtoView {
}
}
_parentElementLightDom(protoElementInjector:ProtoElementInjector, preBuiltObjects:List):LightDom {
var p = protoElementInjector.parent;
_directParentElementLightDom(protoElementInjector:ProtoElementInjector, preBuiltObjects:List):LightDom {
var p = protoElementInjector.directParent();
return isPresent(p) ? preBuiltObjects[p.index].lightDom : null;
}