WIP: fixed

vojtajina · May 14, 2014 · e10bd88 · e10bd88
1 parent ff56c2e
commit e10bd88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/ng/compile.js b/src/ng/compile.js
@@ -950,7 +950,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
  childScope = scope;
  }
  childTranscludeFn = nodeLinkFn.transclude;
- if (childTranscludeFn || (!boundTranscludeFn && transcludeFn)) {
+ if ((nodeLinkFn.transcludeOnThisElement) || (!boundTranscludeFn && transcludeFn)) {
  nodeLinkFn(childLinkFn, childScope, node, $rootElement,
  createBoundTranscludeFn(scope, childTranscludeFn || transcludeFn)
  );
@@ -1332,7 +1332,14 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
  }
 
  nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true;
- nodeLinkFn.transclude = hasTranscludeDirective && childTranscludeFn;
+ if (hasTranscludeDirective) {
+ nodeLinkFn.transclude = childTranscludeFn;
+ nodeLinkFn.transcludeOnThisElement = true;
+ } else if (!templateDirective) {
+ nodeLinkFn.transclude = childTranscludeFn;
+ nodeLinkFn.transcludeOnThisElement = false;
+ }
+
  previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective;
 
  // might be normal or delayed nodeLinkFn depending on if templateUrl is present

diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
@@ -1575,7 +1575,7 @@ describe('$compile', function() {
 
 
 
- iit('should allow nested transclude directives', function() {
+ it('should allow nested transclude directives', function() {
 
  module(function($compileProvider) {