From 0a268f35bc1bc862213376ac386af3e06c3b35bd Mon Sep 17 00:00:00 2001 From: "Anup N. Kamath" <30480046+akamath46297@users.noreply.github.com> Date: Tue, 5 Mar 2019 19:17:42 -0800 Subject: [PATCH] Fix backup (#4274) * check to see whether options is available * removing options state and using _modelOptions * removed additional space * making options getter private as not intended to expose --- src/sql/workbench/browser/modal/modal.ts | 2 +- src/sql/workbench/browser/modal/optionsDialog.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/sql/workbench/browser/modal/modal.ts b/src/sql/workbench/browser/modal/modal.ts index 110180d465..f0e6c8eacb 100644 --- a/src/sql/workbench/browser/modal/modal.ts +++ b/src/sql/workbench/browser/modal/modal.ts @@ -74,6 +74,7 @@ const defaultOptions: IModalOptions = { export abstract class Modal extends Disposable implements IThemable { protected _useDefaultMessageBoxLocation: boolean = true; protected _messageElement: HTMLElement; + protected _modalOptions: IModalOptions; private _messageIcon: HTMLElement; private _messageSeverity: Builder; private _messageSummary: Builder; @@ -114,7 +115,6 @@ export abstract class Modal extends Disposable implements IThemable { private _keydownListener: IDisposable; private _resizeListener: IDisposable; - private _modalOptions: IModalOptions; private _backButton: Button; private _modalShowingContext: IContextKey>; diff --git a/src/sql/workbench/browser/modal/optionsDialog.ts b/src/sql/workbench/browser/modal/optionsDialog.ts index 396f18b3da..35edf2b7cf 100644 --- a/src/sql/workbench/browser/modal/optionsDialog.ts +++ b/src/sql/workbench/browser/modal/optionsDialog.ts @@ -87,7 +87,7 @@ export class OptionsDialog extends Modal { constructor( title: string, name: string, - private options: IOptionsDialogOptions, + options: IOptionsDialogOptions, @IPartService partService: IPartService, @IWorkbenchThemeService private _workbenchThemeService: IWorkbenchThemeService, @IContextViewService private _contextViewService: IContextViewService, @@ -178,6 +178,10 @@ export class OptionsDialog extends Modal { } } + private get options(): IOptionsDialogOptions { + return this._modalOptions as IOptionsDialogOptions; + } + public get optionValues(): { [name: string]: any } { return this._optionValues; }