mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-30 01:25:38 -05:00
Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)
* 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:
@@ -94,7 +94,7 @@ export class ImageCalloutDialog extends Modal {
|
||||
return this._selectionComplete.promise;
|
||||
}
|
||||
|
||||
public render(): void {
|
||||
public override render(): void {
|
||||
super.render();
|
||||
attachCalloutDialogStyler(this, this._themeService);
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ export class LinkCalloutDialog extends Modal {
|
||||
return this._selectionComplete.promise;
|
||||
}
|
||||
|
||||
public render(): void {
|
||||
public override render(): void {
|
||||
super.render();
|
||||
attachCalloutDialogStyler(this, this._themeService);
|
||||
|
||||
@@ -144,13 +144,13 @@ export class LinkCalloutDialog extends Modal {
|
||||
this._register(styler.attachInputBoxStyler(this._linkUrlInputBox, this._themeService));
|
||||
}
|
||||
|
||||
protected onAccept(e?: StandardKeyboardEvent) {
|
||||
protected override onAccept(e?: StandardKeyboardEvent) {
|
||||
// EventHelper.stop() will call preventDefault. Without it, text cell will insert an extra newline when pressing enter on dialog
|
||||
DOM.EventHelper.stop(e, true);
|
||||
this.insert();
|
||||
}
|
||||
|
||||
protected onClose(e?: StandardKeyboardEvent) {
|
||||
protected override onClose(e?: StandardKeyboardEvent) {
|
||||
DOM.EventHelper.stop(e, true);
|
||||
this.cancel();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user