Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-13 09:13:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ngInclude): fire $includeContentLoaded on proper (child) scope

Browse source
This commit is contained in:
Vojta Jina 2012-03-30 13:54:43 -07:00
parent 5f70d615a5
commit 199ac26986
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ng/directive/ngInclude.js
View file

@ -110,7 +110,7 @@ var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$compile'
$anchorScroll(); $anchorScroll();
} }
scope.$emit('$includeContentLoaded'); childScope.$emit('$includeContentLoaded');
scope.$eval(onloadExp); scope.$eval(onloadExp);
}).error(function() { }).error(function() {
if (thisChangeId === changeCounter) clearContent(); if (thisChangeId === changeCounter) clearContent();

5
test/ng/directive/ngIncludeSpec.js
View file

@ -60,9 +60,10 @@ describe('ng-include', function() {
})); }));
it('should fire $includeContentLoaded event after linking the content', inject( it('should fire $includeContentLoaded event on child scope after linking the content', inject(
function($rootScope, $compile, $templateCache) { function($rootScope, $compile, $templateCache) {
var contentLoadedSpy = jasmine.createSpy('content loaded').andCallFake(function() { var contentLoadedSpy = jasmine.createSpy('content loaded').andCallFake(function(event) {
expect(event.targetScope.$parent).toBe($rootScope);
expect(element.text()).toBe('partial content'); expect(element.text()).toBe('partial content');
}); });