Merge from vscode 011858832762aaff245b2336fb1c38166e7a10fb (#4663)

This commit is contained in:
Anthony Dresser
2019-03-22 13:07:54 -07:00
committed by GitHub
parent f5c9174c2f
commit 4a87a24235
296 changed files with 2531 additions and 2472 deletions

View File

@@ -50,7 +50,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
private compositeSwitcherBar: ActionBar;
private compositeOverflowAction: CompositeOverflowActivityAction | null;
private compositeOverflowActionItem: CompositeOverflowActivityActionItem | null;
private compositeOverflowActionItem: CompositeOverflowActivityActionItem | undefined;
private model: CompositeBarModel;
private visibleComposites: string[];
@@ -345,7 +345,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
if (this.compositeOverflowActionItem) {
this.compositeOverflowActionItem.dispose();
}
this.compositeOverflowActionItem = null;
this.compositeOverflowActionItem = undefined;
}
// Pull out composites that overflow or got hidden