aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIgor Minar2013-07-18 11:30:32 -0700
committerIgor Minar2013-07-22 11:27:53 -0700
commit45f9f62367221b2aa097ba1d87d744e50140ddc7 (patch)
tree21ea3918281986ddf2137bdee0c3101624d5856a /src
parent3967f5f7d6c8aa7b41a5352b12f457e2fbaa251a (diff)
downloadangular.js-45f9f62367221b2aa097ba1d87d744e50140ddc7.tar.bz2
fix($compile): always instantiate controllers in parent->child order
Previously it was possible to get into a situation where child controller was being instantiated before parent which resulted in an error. Closes #2738
Diffstat (limited to 'src')
-rw-r--r--src/ng/directive/ngTransclude.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/ng/directive/ngTransclude.js b/src/ng/directive/ngTransclude.js
index c15b77cb..668f8033 100644
--- a/src/ng/directive/ngTransclude.js
+++ b/src/ng/directive/ngTransclude.js
@@ -49,9 +49,14 @@
*
*/
var ngTranscludeDirective = ngDirective({
- controller: ['$transclude', '$element', function($transclude, $element) {
- $transclude(function(clone) {
- $element.append(clone);
+ controller: ['$transclude', '$element', '$scope', function($transclude, $element, $scope) {
+ // use evalAsync so that we don't process transclusion before directives on the parent element even when the
+ // transclusion replaces the current element. (we can't use priority here because that applies only to compile fns
+ // and not controllers
+ $scope.$evalAsync(function() {
+ $transclude(function(clone) {
+ $element.append(clone);
+ });
});
}]
});