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

Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

Browse Source 
* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/base/browser/ui/taskbar/actionbar.ts
View File

@@ -43,13 +43,12 @@ export class ActionBar extends ActionRunner implements IActionRunner {
super();
this._options = options;
this._context = options.context;
this._toDispose = [];
if (this._options.actionRunner) {
this._actionRunner = this._options.actionRunner;
} else {
this._actionRunner = new ActionRunner();
this._toDispose.push(this._actionRunner);
this._register(this._actionRunner);
}
//this._toDispose.push(this.addEmitter(this._actionRunner));
@@ -365,8 +364,6 @@ export class ActionBar extends ActionRunner implements IActionRunner {
lifecycle.dispose(this._items);
this._items = [];
this._toDispose = lifecycle.dispose(this._toDispose);
this._domNode.remove();
super.dispose();