From 466320f6911698048bae5406e341d25af7efafa0 Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Thu, 4 Sep 2014 13:27:19 +0100 Subject: [PATCH] fix($compile): render nested transclusion at the root of a template Closes #8914 Closes #8925 --- src/ng/compile.js | 4 ++++ test/ng/compileSpec.js | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/src/ng/compile.js b/src/ng/compile.js index 63eb52fcb77f..82b5c0e59156 100644 --- a/src/ng/compile.js +++ b/src/ng/compile.js @@ -847,6 +847,10 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { ? JQLitePrototype.clone.call($compileNodes) // IMPORTANT!!! : $compileNodes; + if ( $linkNode.length === 0 && parentBoundTranscludeFn ) { + $linkNode = parentBoundTranscludeFn(scope); + } + forEach(transcludeControllers, function(instance, name) { $linkNode.data('$' + name + 'Controller', instance); }); diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js index 992d7edc51e1..f74cdf0784d8 100755 --- a/test/ng/compileSpec.js +++ b/test/ng/compileSpec.js @@ -4097,6 +4097,37 @@ describe('$compile', function() { }); + describe('collocated nested transcludes', function() { + + beforeEach(module(function($compileProvider) { + + $compileProvider.directive('inner', valueFn({ + restrict: 'E', + transclude: true, + template: '' + })); + + $compileProvider.directive('outer', valueFn({ + restrict: 'E', + transclude: true, + template: '' + })); + + })); + + + // Issue #8914 + it('should render nested transclusion at the root of a template', inject(function($compile, $rootScope) { + + element = $compile('
transcluded content
')($rootScope); + $rootScope.$digest(); + expect(element.text()).toEqual('transcluded content'); + + })); + + }); + + describe('nested transcludes', function() { beforeEach(module(function($compileProvider) {