diff options
| author | Igor Minar | 2013-08-21 00:22:40 -0700 | 
|---|---|---|
| committer | Igor Minar | 2013-08-21 01:21:02 -0700 | 
| commit | 0d7f19bb620ca4f733e5c202807921501e35172c (patch) | |
| tree | 4f07f070ffdefc3981fa4b4d8ce8bd6134e8146d /src | |
| parent | 607045d5921fcd202f2d6f62428bcb2cf076fd20 (diff) | |
| download | angular.js-0d7f19bb620ca4f733e5c202807921501e35172c.tar.bz2 | |
revert: fix($compile): always instantiate controllers...
fix($compile): always instantiate controllers in parent->child order
This reverts commit 683fd713c41eaf5da8bfbf53b574e0176c18c518.
It turns out that there is some existing code that relies on the
incorrect timing. Rather than breaking these apps that depend on
stable releases, we are going to keep this changeo only in master
and the apps will need to migrate to the correc timing during the
1.2 upgrade.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ng/directive/ngTransclude.js | 11 | 
1 files changed, 3 insertions, 8 deletions
| diff --git a/src/ng/directive/ngTransclude.js b/src/ng/directive/ngTransclude.js index 668f8033..c15b77cb 100644 --- a/src/ng/directive/ngTransclude.js +++ b/src/ng/directive/ngTransclude.js @@ -49,14 +49,9 @@   *   */  var ngTranscludeDirective = ngDirective({ -  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); -      }); +  controller: ['$transclude', '$element', function($transclude, $element) { +    $transclude(function(clone) { +      $element.append(clone);      });    }]  }); | 
