kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-24 05:06:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolving merge conflicts as part of pull request #9826 for updates to IDialogOptions, IPromptDialog, and IPanelConfig"

Browse Source
This commit is contained in:
Alex Staroselsky
2016-06-26 18:49:54 -05:00
parent 76fbff846f bbdbb551a9
commit 74a3e8c937
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
angular-material/angular-material.d.ts vendored
View File

@@ -83,7 +83,7 @@ declare namespace angular.material {
scope?: angular.IScope; // default: new child scope
preserveScope?: boolean; // default: false
disableParentScroll?: boolean; // default: true
hasBackdrop?: boolean // default: true
hasBackdrop?: boolean; // default: true
clickOutsideToClose?: boolean; // default: false
escapeToClose?: boolean; // default: true
focusOnOpen?: boolean; // default: true
@@ -96,12 +96,8 @@ declare namespace angular.material {
onShowing?: Function;
onComplete?: Function;
onRemoving?: Function;
<<<<<<< 3baa34499f7a3549b484081bbb081ba22f0596eb
fullscreen?: boolean;
skipHide?: boolean;
=======
fullscreen?: boolean; // default: false
>>>>>>> Updated IDialogOptions to include contentElement property for prerendered dialogs. Updated IPromptDialog to add initialValue method. Adding missing semicolon to IPanelConfig.
}
interface IDialogService {