Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Commit

Permalink
fix($compile): correct isolate scope distribution to controllers
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
IgorMinar committed Nov 8, 2013
1 parent 97c7a4e commit 3fe4491
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/ng/compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 24 additions & 0 deletions test/ng/compileSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2480,6 +2480,30 @@ describe('$compile', function() {
});


it('should give the isolate scope to the controller of another replaced directives in the template', function() {
module(function() {
directive('testDirective', function() {
return {
replace: true,
restrict: 'E',
scope: {},
template: '<input type="checkbox" ng-model="model">'
};
});
});

inject(function($rootScope) {
compile('<div><test-directive></test-directive></div>');

element = element.children().eq(0);
expect(element[0].checked).toBe(false);
element.isolateScope().model = true;
$rootScope.$digest();
expect(element[0].checked).toBe(true);
});
});


it('should share isolate scope with replaced directives', function() {
var normalScope;
var isolateScope;
Expand Down

0 comments on commit 3fe4491

Please sign in to comment.