diff --git a/angular-material/angular-material-tests.ts b/angular-material/angular-material-tests.ts
index 8e2bdfdf43..4464c599e3 100644
--- a/angular-material/angular-material-tests.ts
+++ b/angular-material/angular-material-tests.ts
@@ -30,7 +30,11 @@ myApp.config((
myApp.controller('BottomSheetController', ($scope: ng.IScope, $mdBottomSheet: ng.material.IBottomSheetService) => {
$scope['openBottomSheet'] = () => {
$mdBottomSheet.show({
- template: 'Hello!'
+ template: 'Hello!',
+ clickOutsideToClose: true,
+ disableBackdrop: true,
+ disableParentScroll: false,
+ parent: () => {}
});
};
$scope['hideBottomSheet'] = $mdBottomSheet.hide.bind($mdBottomSheet, 'hide');
@@ -115,6 +119,14 @@ myApp.controller('SidenavController', ($scope: ng.IScope, $mdSidenav: ng.materia
$scope['close'] = () => $mdSidenav(componentId).close();
$scope['isOpen'] = $mdSidenav(componentId).isOpen();
$scope['isLockedOpen'] = $mdSidenav(componentId).isLockedOpen();
+
+ $scope['asyncLookup'] = $mdSidenav(componentId, true).then((instance) => {
+ instance.toggle();
+ instance.open();
+ instance.close();
+ instance.isOpen();
+ instance.isLockedOpen();
+ });
});
myApp.controller('ToastController', ($scope: ng.IScope, $mdToast: ng.material.IToastService) => {
diff --git a/angular-material/angular-material.d.ts b/angular-material/angular-material.d.ts
index d79e75a07d..2be0a6d874 100644
--- a/angular-material/angular-material.d.ts
+++ b/angular-material/angular-material.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Angular Material 1.0.0-rc5+ (angular.material module)
+// Type definitions for Angular Material 1.1.0-rc5+ (angular.material module)
// Project: https://github.com/angular/material
// Definitions by: Matt Traynham
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -19,11 +19,12 @@ declare namespace angular.material {
preserveScope?: boolean; // default: false
controller?: string|Function;
locals?: {[index: string]: any};
- targetEvent?: MouseEvent;
- resolve?: {[index: string]: angular.IPromise}
+ clickOutsideToClose?: boolean;
+ disableBackdrop?: boolean;
+ escapeToClose?: boolean;
+ resolve?: {[index: string]: angular.IPromise};
controllerAs?: string;
- bindToController?: boolean;
- parent?: string|Element|JQuery; // default: root node
+ parent?: Function|string|Object; // default: root node
disableParentScroll?: boolean; // default: true
}
@@ -134,6 +135,7 @@ declare namespace angular.material {
}
interface ISidenavService {
+ (component: string, enableWait: boolean): angular.IPromise;
(component: string): ISidenavObject;
}