提交 26cb1c81 编写于 作者: S SteVen Batten

strictFunctionTypes

refs #81574
上级 d45eaa2f
...@@ -286,7 +286,7 @@ export class ActivitybarPart extends Part implements IActivityBarService { ...@@ -286,7 +286,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
private createGlobalActivityActionBar(container: HTMLElement): void { private createGlobalActivityActionBar(container: HTMLElement): void {
this.globalActivityActionBar = this._register(new ActionBar(container, { this.globalActivityActionBar = this._register(new ActionBar(container, {
actionViewItemProvider: action => this.instantiationService.createInstance(GlobalActivityActionViewItem, action, (theme: ITheme) => this.getActivitybarItemColors(theme)), actionViewItemProvider: action => this.instantiationService.createInstance(GlobalActivityActionViewItem, action as ActivityAction, (theme: ITheme) => this.getActivitybarItemColors(theme)),
orientation: ActionsOrientation.VERTICAL, orientation: ActionsOrientation.VERTICAL,
ariaLabel: nls.localize('manage', "Manage"), ariaLabel: nls.localize('manage', "Manage"),
animated: false animated: false
......
...@@ -100,7 +100,7 @@ export class CompositeBar extends Widget implements ICompositeBar { ...@@ -100,7 +100,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
return this.compositeOverflowActionViewItem; return this.compositeOverflowActionViewItem;
} }
const item = this.model.findItem(action.id); const item = this.model.findItem(action.id);
return item && this.instantiationService.createInstance(CompositeActionViewItem, action, item.pinnedAction, () => this.getContextMenuActions(), this.options.colors, this.options.icon, this); return item && this.instantiationService.createInstance(CompositeActionViewItem, action as ActivityAction, item.pinnedAction, () => this.getContextMenuActions() as Action[], this.options.colors, this.options.icon, this);
}, },
orientation: this.options.orientation, orientation: this.options.orientation,
ariaLabel: nls.localize('activityBarAriaLabel', "Active View Switcher"), ariaLabel: nls.localize('activityBarAriaLabel', "Active View Switcher"),
......
...@@ -362,8 +362,8 @@ export class CompositeOverflowActivityActionViewItem extends ActivityActionViewI ...@@ -362,8 +362,8 @@ export class CompositeOverflowActivityActionViewItem extends ActivityActionViewI
constructor( constructor(
action: ActivityAction, action: ActivityAction,
private getOverflowingComposites: () => { id: string, name: string }[], private getOverflowingComposites: () => { id: string, name?: string }[],
private getActiveCompositeId: () => string, private getActiveCompositeId: () => string | undefined,
private getBadge: (compositeId: string) => IBadge, private getBadge: (compositeId: string) => IBadge,
private getCompositeOpenAction: (compositeId: string) => Action, private getCompositeOpenAction: (compositeId: string) => Action,
colors: (theme: ITheme) => ICompositeBarColors, colors: (theme: ITheme) => ICompositeBarColors,
...@@ -404,7 +404,7 @@ export class CompositeOverflowActivityActionViewItem extends ActivityActionViewI ...@@ -404,7 +404,7 @@ export class CompositeOverflowActivityActionViewItem extends ActivityActionViewI
if (suffix) { if (suffix) {
action.label = nls.localize('numberBadge', "{0} ({1})", composite.name, suffix); action.label = nls.localize('numberBadge', "{0} ({1})", composite.name, suffix);
} else { } else {
action.label = composite.name; action.label = composite.name || '';
} }
return action; return action;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册