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

angular · Apr 3, 2012 · 199ac26 · 199ac26
1 parent 5f70d61
commit 199ac26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ng/directive/ngInclude.js b/src/ng/directive/ngInclude.js
@@ -110,7 +110,7 @@ var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$compile'
                 $anchorScroll();
               }
 
-              scope.$emit('$includeContentLoaded');
+              childScope.$emit('$includeContentLoaded');
               scope.$eval(onloadExp);
             }).error(function() {
               if (thisChangeId === changeCounter) clearContent();

diff --git a/test/ng/directive/ngIncludeSpec.js b/test/ng/directive/ngIncludeSpec.js
@@ -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) {
-    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');
     });