Merge pull request #4181 from damianog/master

added controllerAs property to modal service settings

angular-ui-bootstrap/angular-ui-bootstrap-tests.ts

@@ -131,6 +131,7 @@ testApp.controller('TestCtrl', (
     var modalInstance = $modal.open({
         backdrop: 'static',
         controller: 'ModalTestCtrl',
+        controllerAs: 'vm',
         keyboard: true,
         resolve: {
             items: ()=> {

angular-ui-bootstrap/angular-ui-bootstrap.d.ts

@@ -237,6 +237,12 @@ declare module angular.ui.bootstrap {
          */
         controller?: any;
 
+        /**
+         *  an alternative to the controller-as syntax, matching the API of directive definitions.
+         *  Requires the controller option to be provided as well
+         */
+        controllerAs?: string;
+
         /**
          * members that will be resolved and passed to the controller as locals; it is equivalent of the `resolve` property for AngularJS routes
          */