diff options
Diffstat (limited to 'src/ng')
| -rw-r--r-- | src/ng/compile.js | 7 | ||||
| -rw-r--r-- | src/ng/directive/ngIf.js | 1 | ||||
| -rw-r--r-- | src/ng/directive/ngRepeat.js | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/ng/compile.js b/src/ng/compile.js index af7d5e6b..d3ade6b8 100644 --- a/src/ng/compile.js +++ b/src/ng/compile.js @@ -1173,9 +1173,10 @@ function $CompileProvider($provide) { } if (directiveValue = directive.transclude) { - // Special case ngRepeat so that we don't complain about duplicate transclusion, ngRepeat - // knows how to handle this on its own. - if (directiveName !== 'ngRepeat' && directiveName !== 'ngIf') { + // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion. + // This option should only be used by directives that know how to how to safely handle element transclusion, + // where the transcluded nodes are added or replaced after linking. + if (!directive.$$tlb) { assertNoDuplicate('transclusion', transcludeDirective, directive, $compileNode); transcludeDirective = directive; } diff --git a/src/ng/directive/ngIf.js b/src/ng/directive/ngIf.js index 3f56449f..35c122ad 100644 --- a/src/ng/directive/ngIf.js +++ b/src/ng/directive/ngIf.js @@ -84,6 +84,7 @@ var ngIfDirective = ['$animate', function($animate) { priority: 600, terminal: true, restrict: 'A', + $$tlb: true, compile: function (element, attr, transclude) { return function ($scope, $element, $attr) { var block = {}, childScope; diff --git a/src/ng/directive/ngRepeat.js b/src/ng/directive/ngRepeat.js index ee0faf23..9e5ad2f5 100644 --- a/src/ng/directive/ngRepeat.js +++ b/src/ng/directive/ngRepeat.js @@ -214,6 +214,7 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) { transclude: 'element', priority: 1000, terminal: true, + $$tlb: true, compile: function(element, attr, linker) { return function($scope, $element, $attr){ var expression = $attr.ngRepeat; |