diff --git a/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts b/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts index a732d9ac7..910cf0eff 100644 --- a/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts +++ b/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts @@ -110,6 +110,8 @@ testApp.config(( $timepickerConfig.mousewheel = false; $timepickerConfig.readonlyInput = true; $timepickerConfig.showMeridian = false; + $timepickerConfig.arrowkeys = false; + $timepickerConfig.showSpinners = false; /** * $tooltipProvider tests @@ -140,7 +142,8 @@ testApp.controller('TestCtrl', ( var modalInstance = $modal.open({ animation: false, backdrop: 'static', - backdropClass: 'testing', + backdropClass: 'modal-backdrop-test', + bindToController: true, controller: 'ModalTestCtrl', controllerAs: 'vm', keyboard: true, @@ -152,7 +155,6 @@ testApp.controller('TestCtrl', ( scope: $scope, template: "
i'm a template!
", templateUrl: '/templates/modal.html', - backdropClass: 'modal-backdrop-test', windowClass: 'modal-test' }); diff --git a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts b/angular-ui-bootstrap/angular-ui-bootstrap.d.ts index d725e529c..95388aada 100644 --- a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts +++ b/angular-ui-bootstrap/angular-ui-bootstrap.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Angular UI Bootstrap 0.13.0 +// Type definitions for Angular UI Bootstrap 0.13.1 // Project: https://github.com/angular-ui/bootstrap // Definitions by: Brian Surowiec // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -262,6 +262,13 @@ declare module angular.ui.bootstrap { */ controllerAs?: string; + /** + * When used with controllerAs and set to true, it will bind the controller properties onto the $scope directly. + * + * @default false + */ + bindToController?: boolean; + /** * members that will be resolved and passed to the controller as locals; it is equivalent of the `resolve` property for AngularJS routes */ @@ -593,6 +600,20 @@ declare module angular.ui.bootstrap { * @default true */ mousewheel?: boolean; + + /** + * Whether the user can use up/down arrowkeys inside the hours & minutes input to increase or decrease it's values. + * + * @default true + */ + arrowkeys?: boolean; + + /** + * Shows spinner arrows above and below the inputs. + * + * @default true + */ + showSpinners?: boolean; }