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

fix the input box validation (#15634)

Browse Source 
* fix the input box validation

* fix one more place
This commit is contained in:
Alan Ren
2021-06-08 14:24:50 -07:00
committed by GitHub
parent a61462a2c0
commit d91660b66f
9 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,7 +425,7 @@ export class InputBox extends Widget {
return !!this.validation && !this.validation(this.value);
}
public validate(): boolean { // {{SQL CARBON EDIT}}
public validate(): MessageType | undefined {
let errorMsg: IMessage | null = null;
if (this.validation) {
@@ -449,8 +449,7 @@ export class InputBox extends Widget {
}
}
// {{SQL CARBON EDIT}} Candidate for addition to vscode
return errorMsg ? errorMsg.type !== MessageType.ERROR : true;
return errorMsg?.type;
}
public stylesForType(type: MessageType | undefined): { border: Color | undefined; background: Color | undefined; foreground: Color | undefined } {

4
src/vs/workbench/contrib/remote/browser/tunnelView.ts
View File

@@ -342,7 +342,7 @@ class TunnelTreeRenderer extends Disposable implements ITreeRenderer<ITunnelGrou
inputBox,
dom.addStandardDisposableListener(inputBox.inputElement, dom.EventType.KEY_DOWN, (e: IKeyboardEvent) => {
if (e.equals(KeyCode.Enter)) {
if (inputBox.validate()) { // {{SQL CARBON EDIT}}
if (inputBox.validate() !== MessageType.ERROR) {
done(true, true);
} else {
done(false, true);
@@ -352,7 +352,7 @@ class TunnelTreeRenderer extends Disposable implements ITreeRenderer<ITunnelGrou
}
}),
dom.addDisposableListener(inputBox.inputElement, dom.EventType.BLUR, () => {
done(inputBox.validate(), true); // {{SQL CARBON EDIT}}
done(inputBox.validate() !== MessageType.ERROR, true);
}),
styler
];