aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIgor Minar2013-11-07 00:24:07 -0800
committerIgor Minar2013-11-07 22:08:05 -0800
commit3fe4491a6bf57ddeb312b8a30cf1706f6f1d2355 (patch)
treec7394c86748040b711567150077084c2d9e62b4b /src
parent97c7a4e3791d7cb05c3317cc5f0c49ab93810bf6 (diff)
downloadangular.js-3fe4491a6bf57ddeb312b8a30cf1706f6f1d2355.tar.bz2
fix($compile): correct isolate scope distribution to controllers
Fixes an issue when we didn't share the isolate scope with the controller of the directive from the isolate directive's template when this directive was replaced onto the isolate directive element.
Diffstat (limited to 'src')
-rw-r--r--src/ng/compile.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ng/compile.js b/src/ng/compile.js
index 42b37a2d..5fefdaaa 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -1440,7 +1440,7 @@ function $CompileProvider($provide) {
if (controllerDirectives) {
forEach(controllerDirectives, function(directive) {
var locals = {
- $scope: directive === newIsolateScopeDirective ? isolateScope : scope,
+ $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
$element: $element,
$attrs: attrs,
$transclude: boundTranscludeFn