Skip to content

Commit e10bd88

Browse files
committed
WIP: fixed
1 parent ff56c2e commit e10bd88

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/ng/compile.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
950950
childScope = scope;
951951
}
952952
childTranscludeFn = nodeLinkFn.transclude;
953-
if (childTranscludeFn || (!boundTranscludeFn && transcludeFn)) {
953+
if ((nodeLinkFn.transcludeOnThisElement) || (!boundTranscludeFn && transcludeFn)) {
954954
nodeLinkFn(childLinkFn, childScope, node, $rootElement,
955955
createBoundTranscludeFn(scope, childTranscludeFn || transcludeFn)
956956
);
@@ -1332,7 +1332,14 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
13321332
}
13331333

13341334
nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true;
1335-
nodeLinkFn.transclude = hasTranscludeDirective && childTranscludeFn;
1335+
if (hasTranscludeDirective) {
1336+
nodeLinkFn.transclude = childTranscludeFn;
1337+
nodeLinkFn.transcludeOnThisElement = true;
1338+
} else if (!templateDirective) {
1339+
nodeLinkFn.transclude = childTranscludeFn;
1340+
nodeLinkFn.transcludeOnThisElement = false;
1341+
}
1342+
13361343
previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective;
13371344

13381345
// might be normal or delayed nodeLinkFn depending on if templateUrl is present

test/ng/compileSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ describe('$compile', function() {
15751575

15761576

15771577

1578-
iit('should allow nested transclude directives', function() {
1578+
it('should allow nested transclude directives', function() {
15791579

15801580
module(function($compileProvider) {
15811581

0 commit comments

Comments
 (0)