ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/workbench/services/dialog/browser/wizardModal.ts
View File

@@ -65,7 +65,7 @@ export class WizardModal extends Modal {
}
public render() {
public override render() {
super.render();
attachModalDialogStyler(this, this._themeService);
@@ -151,7 +151,7 @@ export class WizardModal extends Modal {
this.updatePageNumbers();
}
protected set messagesElementVisible(visible: boolean) {
protected override set messagesElementVisible(visible: boolean) {
if (visible) {
this._mpContainer.prepend(this._messageElement);
} else {
@@ -309,14 +309,14 @@ export class WizardModal extends Modal {
/**
* Overridable to change behavior of escape key
*/
protected onClose(e: StandardKeyboardEvent): void {
protected override onClose(e: StandardKeyboardEvent): void {
this.cancel();
}
/**
* Overridable to change behavior of enter key
*/
protected onAccept(e: StandardKeyboardEvent): void {
protected override onAccept(e: StandardKeyboardEvent): void {
if (this._wizard.currentPage === this._wizard.pages.length - 1) {
this.done().catch(err => onUnexpectedError(err));
} else {
@@ -326,7 +326,7 @@ export class WizardModal extends Modal {
}
}
public dispose(): void {
public override dispose(): void {
super.dispose();
this._dialogPanes.forEach(dialogPane => dialogPane.dispose());
}