ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update LabeledMenuItemActionItem to match new vscode behavior. (#4264)

Browse Source
This commit is contained in:
Cory Rivera
2019-03-01 17:37:12 -08:00
committed by GitHub
parent c1e5408492
commit db8a92f5c2
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/parts/notebook/notebook.component.ts
View File

@@ -493,7 +493,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
let secondary: IAction[] = [];
let notebookBarMenu = this.menuService.createMenu(MenuId.NotebookToolbar, this.contextKeyService);
let groups = notebookBarMenu.getActions({ arg: null, shouldForwardArgs: true });
fillInActions(groups, { primary, secondary }, false, (group: string) => group === undefined);
fillInActions(groups, { primary, secondary }, false, (group: string) => group === undefined || group === '');
this.addPrimaryContributedActions(primary);
}

15
src/vs/platform/actions/browser/menuItemActionItem.ts
View File

@@ -283,8 +283,9 @@ export class LabeledMenuItemActionItem extends MenuItemActionItem {
) {
super(_action, _labeledkeybindingService, _notificationService, _labeledcontextMenuService);
}
_updateLabel(): void {
this.element.innerText = this._commandAction.label;
updateLabel(): void {
this.label.innerText = this._commandAction.label;
}
// Overwrite item class to ensure that we can pass in a CSS class that other items use
@@ -307,14 +308,8 @@ export class LabeledMenuItemActionItem extends MenuItemActionItem {
MenuItemActionItem.ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass);
}
this.element.classList.add('icon', iconClass);
this.element.classList.add(this._defaultCSSClassToAdd);
this._labeledItemClassDispose = {
dispose: () => {
this.element.classList.remove('icon', iconClass);
this.element.classList.remove(this._defaultCSSClassToAdd);
}
};
addClasses(this.label, 'icon', iconClass, this._defaultCSSClassToAdd);
this._labeledItemClassDispose = toDisposable(() => removeClasses(this.label, 'icon', iconClass, this._defaultCSSClassToAdd));
}
}