ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-02 09:35:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

Browse Source 
This reverts commit d15a3fcc98.
This commit is contained in:
Karl Burtram
2019-06-11 12:35:58 -07:00
committed by GitHub
parent 95a50b7892
commit 5a7562a37b
926 changed files with 11394 additions and 19540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/vs/base/browser/ui/inputbox/inputBox.ts
View File

@@ -28,8 +28,7 @@ export interface IInputOptions extends IInputBoxStyles {
readonly type?: string;
readonly validationOptions?: IInputValidationOptions;
readonly flexibleHeight?: boolean;
readonly actions?: ReadonlyArray<IAction>;
readonly actions?: IAction[];
// {{SQL CARBON EDIT}} Candidate for addition to vscode
readonly min?: string;
@@ -100,7 +99,7 @@ export class InputBox extends Widget {
private placeholder: string;
private ariaLabel: string;
private validation?: IInputValidator;
private state: 'idle' | 'open' | 'closed' = 'idle';
private state: string | null = 'idle';
private cachedHeight: number | null;
// {{SQL CARBON EDIT}} - Add showValidationMessage and set inputBackground, inputForeground, and inputBorder as protected
@@ -423,6 +422,8 @@ export class InputBox extends Widget {
let div: HTMLElement;
let layout = () => div.style.width = dom.getTotalWidth(this.element) + 'px';
this.state = 'open';
this.contextViewProvider.showContextView({
getAnchor: () => this.element,
anchorAlignment: AnchorAlignment.RIGHT,
@@ -453,25 +454,18 @@ export class InputBox extends Widget {
return null;
},
onHide: () => {
this.state = 'closed';
},
layout: layout
});
this.state = 'open';
}
private _hideMessage(): void {
if (!this.contextViewProvider) {
if (!this.contextViewProvider || this.state !== 'open') {
return;
}
if (this.state === 'open') {
this.contextViewProvider.hideContextView();
}
this.state = 'idle';
this.contextViewProvider.hideContextView();
}
private onValueChange(): void {
@@ -561,7 +555,7 @@ export class InputBox extends Widget {
this.contextViewProvider = undefined;
this.message = null;
this.validation = undefined;
this.state = null!; // StrictNullOverride: nulling out ok in dispose
this.state = null;
this.actionbar = undefined;
super.dispose();