fix(shadow_dom_emulation): handle the case when the array of element injectors has nulls

vsavkin · vsavkin · commit 29f5ee0c293e · 2015-02-20T15:52:15.000-08:00
diff --git a/modules/angular2/src/core/compiler/shadow_dom_emulation/light_dom.js b/modules/angular2/src/core/compiler/shadow_dom_emulation/light_dom.js
@@ -105,7 +105,8 @@ export class LightDom {
 
     var viewInj = this.lightDomView.elementInjectors;
     this.roots = ListWrapper.map(this.nodes, (n) =>
-      new _Root(n, ListWrapper.find(viewInj, (inj) => inj.forElement(n))));
+      new _Root(n, ListWrapper.find(viewInj,
+        (inj) => isPresent(inj) ? inj.forElement(n) : false)));
 
     return this.roots;
   }
diff --git a/modules/angular2/test/core/compiler/shadow_dom/light_dom_spec.js b/modules/angular2/test/core/compiler/shadow_dom/light_dom_spec.js
@@ -180,6 +180,19 @@ export function main() {
 
         expect(toHtml(lightDom.expandedDomNodes())).toEqual(["<a></a>"]);
       });
+
+      it("should work when the element injector array contains nulls", () => {
+        var lightDomEl = el("<div><a></a></div>")
+
+        var lightDomView = new FakeView([null]);
+
+        var lightDom = new LightDom(
+          lightDomView,
+          new FakeView(),
+          lightDomEl);
+
+        expect(toHtml(lightDom.expandedDomNodes())).toEqual(["<a></a>"]);
+      });
     });
 
     describe("redistribute", () => {

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ export class LightDom {`
`105`	`105`
`106`	`106`	`var viewInj = this.lightDomView.elementInjectors;`
`107`	`107`	`this.roots = ListWrapper.map(this.nodes, (n) =>`
`108`		`- new _Root(n, ListWrapper.find(viewInj, (inj) => inj.forElement(n))));`
	`108`	`+ new _Root(n, ListWrapper.find(viewInj,`
	`109`	`+ (inj) => isPresent(inj) ? inj.forElement(n) : false)));`
`109`	`110`
`110`	`111`	`return this.roots;`
`111`	`112`	`}`