maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes Microsoft/monaco-editor#446

Browse source
This commit is contained in:
Alex Dima 2017-06-07 17:40:21 +02:00
parent dfc9961ae1
commit 36e83cc200
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/base/browser/ui/actionbar/actionbar.ts
View file

@ -218,6 +218,7 @@ export interface IActionItemOptions extends IBaseActionItemOptions {
icon?: boolean;
label?: boolean;
keybinding?: string;
isMenu?: boolean;
}
export class ActionItem extends BaseActionItem {
@ -239,7 +240,11 @@ export class ActionItem extends BaseActionItem {
super.render(container);
this.$e = $('a.action-label').appendTo(this.builder);
this.$e.attr({ role: 'button' });
if (this.options.isMenu) {
this.$e.attr({ role: 'menuitem' });
} else {
this.$e.attr({ role: 'button' });
}
if (this.options.label && this.options.keybinding) {
$('span.keybinding').text(this.options.keybinding).appendTo(this.builder);
@ -343,6 +348,7 @@ export interface IActionBarOptions {
actionRunner?: IActionRunner;
ariaLabel?: string;
animated?: boolean;
isMenu?: boolean;
}
let defaultOptions: IActionBarOptions = {
@ -458,7 +464,11 @@ export class ActionBar extends EventEmitter implements IActionRunner {
this.actionsList = document.createElement('ul');
this.actionsList.className = 'actions-container';
this.actionsList.setAttribute('role', 'toolbar');
if (this.options.isMenu) {
this.actionsList.setAttribute('role', 'menubar');
} else {
this.actionsList.setAttribute('role', 'toolbar');
}
if (this.options.ariaLabel) {
this.actionsList.setAttribute('aria-label', this.options.ariaLabel);
}

3
src/vs/base/browser/ui/menu/menu.ts
View file

@ -36,7 +36,8 @@ export class Menu extends EventEmitter {
orientation: ActionsOrientation.VERTICAL,
actionItemProvider: options.actionItemProvider,
context: options.context,
actionRunner: options.actionRunner
actionRunner: options.actionRunner,
isMenu: true
});
this.listener = this.addEmitter(this.actionBar);

2
src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
View file

@ -175,7 +175,7 @@ export class ContextMenuController implements IEditorContribution {
getActionItem: (action) => {
var keybinding = this._keybindingFor(action);
if (keybinding) {
return new ActionItem(action, action, { label: true, keybinding: keybinding.getLabel() });
return new ActionItem(action, action, { label: true, keybinding: keybinding.getLabel(), isMenu: true });
}
var customActionItem = <any>action;