fix(content_projection): allow to project text nodes to a place witho…

…ut bindings Fixes #3163
angular · Jul 21, 2015 · 29f6ce1 · 29f6ce1
1 parent 078475a
commit 29f6ce1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/modules/angular2/src/render/dom/view/proto_view_merger.ts b/modules/angular2/src/render/dom/view/proto_view_merger.ts
@@ -27,6 +27,9 @@ export function mergeProtoViewsRecursively(protoViewRefs: List<RenderProtoViewRe
   mergeEmbeddedPvsIntoComponentOrRootPv(clonedProtoViews, hostViewAndBinderIndices);
   var fragments = [];
   mergeComponents(clonedProtoViews, hostViewAndBinderIndices, fragments);
+  // Note: Need to remark parent elements of bound text nodes
+  // so that we can find them later via queryBoundElements!
+  markBoundTextNodeParentsAsBoundElements(clonedProtoViews);
 
   // create a new root element with the changed fragments and elements
   var rootElement = createRootElementFromFragments(fragments);
@@ -86,6 +89,17 @@ function cloneProtoViews(protoViewRefs: List<RenderProtoViewRef | List<any>>,
   }
 }
 
+function markBoundTextNodeParentsAsBoundElements(mergableProtoViews: ClonedProtoView[]) {
+  mergableProtoViews.forEach((mergableProtoView) => {
+    mergableProtoView.boundTextNodes.forEach((textNode) => {
+      var parentNode = textNode.parentNode;
+      if (isPresent(parentNode) && DOM.isElementNode(parentNode)) {
+        DOM.addClass(parentNode, NG_BINDING_CLASS);
+      }
+    });
+  });
+}
+
 function indexBoundTextNodes(mergableProtoViews: ClonedProtoView[]): Map<Node, any> {
   var boundTextNodeMap = new Map();
   for (var pvIndex = 0; pvIndex < mergableProtoViews.length; pvIndex++) {

diff --git a/modules/angular2/test/render/dom/view/proto_view_merger_integration_spec.ts b/modules/angular2/test/render/dom/view/proto_view_merger_integration_spec.ts
@@ -98,6 +98,11 @@ export function main() {
              'root', ['<a>{{b}}</a>', 'A(<ng-content></ng-content>)'],
              ['<root class="ng-binding" idx="0"><a class="ng-binding" idx="1">A({0})</a></root>']));
 
+      it('should project text interpolation to elements without bindings',
+         runAndAssert('root', ['<a>{{b}}</a>', '<div><ng-content></ng-content></div>'], [
+           '<root class="ng-binding" idx="0"><a class="ng-binding" idx="1"><div class="ng-binding">{0}</div></a></root>'
+         ]));
+
       it('should project elements',
          runAndAssert('root', ['<a><div></div></a>', 'A(<ng-content></ng-content>)'], [
            '<root class="ng-binding" idx="0"><a class="ng-binding" idx="1">A(<div></div>)</a></root>'