Preserving Controller Directives

teropa · Apr 27, 2015 · ca8fe12 · ca8fe12
1 parent 903d1c0
commit ca8fe12
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/compile.js b/src/compile.js
@@ -349,7 +349,7 @@ function $CompileProvider($provide) {
       var newScopeDirective;
       var newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective;
       var templateDirective = previousCompileContext.templateDirective;
-      var controllerDirectives;
+      var controllerDirectives = previousCompileContext.controllerDirectives;
 
       function getControllers(require, $element) {
         if (_.isArray(require)) {
@@ -447,6 +447,7 @@ function $CompileProvider($provide) {
             {
               templateDirective: templateDirective,
               newIsolateScopeDirective: newIsolateScopeDirective,
+              controllerDirectives: controllerDirectives,
               preLinkFns: preLinkFns,
               postLinkFns: postLinkFns
             }

diff --git a/test/compile_spec.js b/test/compile_spec.js
@@ -2418,6 +2418,38 @@ describe('$compile', function() {
       });
     });
 
+    it('sets up controllers for all controller directives', function() {
+      var myDirectiveControllerInstantiated, myOtherDirectiveControllerInstantiated;
+      var injector = makeInjectorWithDirectives({
+        myDirective: function() {
+          return {
+            controller: function MyDirectiveController() {
+              myDirectiveControllerInstantiated = true;
+            }
+          };
+        },
+        myOtherDirective: function() {
+          return {
+            templateUrl: '/my_other_directive.html',
+            controller: function MyOtherDirectiveController() {
+              myOtherDirectiveControllerInstantiated = true;
+            }
+          };
+        }
+      });
+      injector.invoke(function($compile, $rootScope) {
+        var el = $('<div my-directive my-other-directive></div>');
+
+        $compile(el)($rootScope);
+        $rootScope.$apply();
+
+        requests[0].respond(200, {}, '<div></div>');
+
+        expect(myDirectiveControllerInstantiated).toBe(true);
+        expect(myOtherDirectiveControllerInstantiated).toBe(true);
+      });
+    });
+
   });
 
 });