ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -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

12
src/sql/workbench/browser/modelComponents/button.component.ts
View File

@@ -65,7 +65,7 @@ export default class ButtonComponent extends ComponentWithIconBase<azdata.Button
this.baseInit();
}
ngOnDestroy(): void {
override ngOnDestroy(): void {
this.baseDestroy();
}
@@ -118,7 +118,7 @@ export default class ButtonComponent extends ComponentWithIconBase<azdata.Button
}));
}
public setProperties(properties: { [key: string]: any; }): void {
public override setProperties(properties: { [key: string]: any; }): void {
super.setProperties(properties);
if (this._currentButtonType !== this.buttonType) {
this.initButton();
@@ -168,11 +168,11 @@ export default class ButtonComponent extends ComponentWithIconBase<azdata.Button
this._changeRef.detectChanges();
}
public focus(): void {
public override focus(): void {
this._button.focus();
}
protected updateIcon() {
protected override updateIcon() {
if (this.iconPath) {
if (!this._iconClass) {
super.updateIcon();
@@ -200,11 +200,11 @@ export default class ButtonComponent extends ComponentWithIconBase<azdata.Button
}
}
protected get defaultIconHeight(): number {
protected override get defaultIconHeight(): number {
return 15;
}
protected get defaultIconWidth(): number {
protected override get defaultIconWidth(): number {
return 15;
}