Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

This reverts commit d15a3fcc98.
This commit is contained in:
Karl Burtram
2019-06-11 12:35:58 -07:00
committed by GitHub
parent 95a50b7892
commit 5a7562a37b
926 changed files with 11394 additions and 19540 deletions

View File

@@ -43,12 +43,13 @@ 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._register(this._actionRunner);
this._toDispose.push(this._actionRunner);
}
//this._toDispose.push(this.addEmitter(this._actionRunner));
@@ -364,6 +365,8 @@ export class ActionBar extends ActionRunner implements IActionRunner {
lifecycle.dispose(this._items);
this._items = [];
this._toDispose = lifecycle.dispose(this._toDispose);
this._domNode.remove();
super.dispose();