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

fix($compile): create new (isolate) scopes for directives on root elements #821

Merged
merged 1 commit into from
Mar 23, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/service/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ function $CompileProvider($provide) {
childLinkingFn = /* nodesetLinkingFn */ linkingFns[i++];

if (directiveLinkingFn) {
if (directiveLinkingFn.scope && !rootElement) {
if (directiveLinkingFn.scope) {
childScope = scope.$new(isObject(directiveLinkingFn.scope));
jqLite(node).data('$scope', childScope);
} else {
Expand Down
19 changes: 14 additions & 5 deletions test/service/compilerSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1035,10 +1035,11 @@ describe('$compile', function() {
);


it('should allow more then one scope creation per element', inject(
it('should allow more one new scope directives per element, but directives should share' +
'the scope', inject(
function($rootScope, $compile, log) {
$compile('<div class="scope-a; scope-b"></div>')($rootScope);
expect(log).toEqual('001; 001');
element = $compile('<div class="scope-a; scope-b"></div>')($rootScope);
expect(log).toEqual('002; 002');
})
);

Expand All @@ -1064,10 +1065,18 @@ describe('$compile', function() {
);


it('should treat new scope on new template as noop', inject(
it('should create new scope even at the root of the template', inject(
function($rootScope, $compile, log) {
element = $compile('<div scope-a></div>')($rootScope);
expect(log).toEqual('001');
expect(log).toEqual('002');
})
);


it('should create isolate scope even at the root of the template', inject(
function($rootScope, $compile, log) {
element = $compile('<div iscope></div>')($rootScope);
expect(log).toEqual('002');
})
);
});
Expand Down