Merge pull request #2475 from hshn/patch-1

fix(viewDirective): fix $element injection for controller

Author: christopherthielen

src/ng1/viewDirective.ts

@@ -289,7 +289,7 @@ function $ViewDirectiveFill (  $compile,   $controller,   $interpolate,   $injec
 
         if (controller) {
           let locals = data.$locals;
-          let controllerInstance = $controller(controller, extend(locals, { $scope: scope }));
+          let controllerInstance = $controller(controller, extend(locals, { $scope: scope, $element: $element }));
           if (controllerAs) scope[controllerAs] = controllerInstance;
           $element.data('$ngControllerController', controllerInstance);
           $element.children().data('$ngControllerController', controllerInstance);

test/viewDirectiveSpec.js

@@ -97,6 +97,12 @@ describe('uiView', function () {
         template: 'view3'
       }
     }
+  },
+  mState = {
+    template: 'mState',
+    controller: function ($scope, $element) {
+      $scope.elementId = $element.attr('id');
+    }
   };
 
   beforeEach(module(function ($stateProvider) {
@@ -113,6 +119,7 @@ describe('uiView', function () {
       .state('j', jState)
       .state('k', kState)
       .state('l', lState)
+      .state('m', mState)
   }));
 
   beforeEach(inject(function ($rootScope, _$compile_) {
@@ -307,6 +314,14 @@ describe('uiView', function () {
     expect(elem.text()).toBe('value');
   }));
 
+  it('should instantiate a controller with both $scope and $element injections', inject(function ($state, $q) {
+    elem.append($compile('<div><ui-view id="mState">{{elementId}}</ui-view></div>')(scope));
+    $state.transitionTo(mState);
+    $q.flush();
+
+    expect(elem.text()).toBe('mState');
+  }));
+
   describe('play nicely with other directives', function() {
     // related to issue #857
     it('should work with ngIf', inject(function ($state, $q, $compile) {