From b1a9cb549f46a8da988c0742e3f03b1dc07a7a85 Mon Sep 17 00:00:00 2001 From: Kara Date: Mon, 12 Jun 2017 10:37:35 -0700 Subject: [PATCH] chore(dialog): rename config to avoid name collisions (#5088) --- src/lib/dialog/dialog-container.ts | 4 ++-- src/lib/dialog/dialog-ref.ts | 2 +- src/lib/dialog/dialog.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts index 1dae3004883..e131df85e58 100644 --- a/src/lib/dialog/dialog-container.ts +++ b/src/lib/dialog/dialog-container.ts @@ -57,7 +57,7 @@ export function throwMdDialogContentAlreadyAttachedError() { ], host: { '[class.mat-dialog-container]': 'true', - '[attr.role]': 'config?.role', + '[attr.role]': '_config?.role', '[@slideDialog]': '_state', '(@slideDialog.done)': '_onAnimationDone($event)', }, @@ -76,7 +76,7 @@ export class MdDialogContainer extends BasePortalHost { private _document: Document; /** The dialog configuration. */ - config: MdDialogConfig; + _config: MdDialogConfig; /** State of the dialog animation. */ _state: 'void' | 'enter' | 'exit' = 'enter'; diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts index 3654acae1aa..b80f4f0b38b 100644 --- a/src/lib/dialog/dialog-ref.ts +++ b/src/lib/dialog/dialog-ref.ts @@ -19,7 +19,7 @@ export class MdDialogRef { componentInstance: T; /** Whether the user is allowed to close the dialog. */ - disableClose: boolean = this._containerInstance.config.disableClose; + disableClose: boolean = this._containerInstance._config.disableClose; /** Subject for notifying the user that the dialog has finished closing. */ private _afterClosed: Subject = new Subject(); diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts index 85d2c847105..aaa2c2a6a03 100644 --- a/src/lib/dialog/dialog.ts +++ b/src/lib/dialog/dialog.ts @@ -146,7 +146,7 @@ export class MdDialog { let containerPortal = new ComponentPortal(MdDialogContainer, viewContainer); let containerRef: ComponentRef = overlay.attach(containerPortal); - containerRef.instance.config = config; + containerRef.instance._config = config; return containerRef.instance; }