feat(uiView): Fire the $onInit hook

After instantiating the controller, will fire its $onInit if defined. Closes #2559
angular-ui · Mar 5, 2016 · b090ca0 · b090ca0
1 parent a928783
commit b090ca0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/viewDirective.js b/src/viewDirective.js
@@ -332,6 +332,7 @@ function $ViewDirectiveFill (  $compile,   $controller,   $state,   $interpolate
             scope[locals.$$controllerAs] = controller;
             scope[locals.$$controllerAs][locals.$$resolveAs] = resolveData;
           }
+          if (isFunction(controller.$onInit)) controller.$onInit();
           $element.data('$ngControllerController', controller);
           $element.children().data('$ngControllerController', controller);
         }

diff --git a/test/viewDirectiveSpec.js b/test/viewDirectiveSpec.js
@@ -420,6 +420,22 @@ describe('uiView', function () {
     }));
   });
 
+  it('should call the existing $onInit after instantiating a controller', inject(function ($state, $q) {
+    var $onInit = jasmine.createSpy();
+    $stateProvider.state('onInit', {
+      controller: function () {
+        this.$onInit = $onInit;
+      },
+      template: "hi",
+      controllerAs: "vm"
+    });
+    elem.append($compile('<div><ui-view></ui-view></div>')(scope));
+    $state.transitionTo('onInit');
+    $q.flush();
+
+    expect($onInit).toHaveBeenCalled();
+  }));
+
   describe('play nicely with other directives', function() {
     // related to issue #857
     it('should work with ngIf', inject(function ($state, $q, $compile) {