diff --git a/programs/calculator/menus.js b/programs/calculator/menus.js index d778a835..674608d3 100644 --- a/programs/calculator/menus.js +++ b/programs/calculator/menus.js @@ -3,7 +3,8 @@ var menus = { "&Edit": [ { label: "&Copy", - shortcut: "Ctrl+C", + shortcutLabel: "Ctrl+C", + ariaKeyShortcuts: "Control+C", enabled: () => { return !!navigator.clipboard.writeText; }, @@ -14,7 +15,8 @@ var menus = { }, { label: "&Paste", - shortcut: "Ctrl+V", + shortcutLabel: "Ctrl+V", + ariaKeyShortcuts: "Control+V", enabled: () => { return !!navigator.clipboard.readText; }, diff --git a/programs/explorer/menus.js b/programs/explorer/menus.js index 9b4a326e..8ee16f42 100644 --- a/programs/explorer/menus.js +++ b/programs/explorer/menus.js @@ -165,19 +165,22 @@ var menus = { MENU_DIVIDER, { label: "Cu&t", - shortcut: "Ctrl+X", + shortcutLabel: "Ctrl+X", + ariaKeyShortcuts: "Control+X", enabled: false, // @TODO description: "Removes the selected items and copies them onto the Clipboard.", }, { label: "&Copy", - shortcut: "Ctrl+C", + shortcutLabel: "Ctrl+C", + ariaKeyShortcuts: "Control+C", enabled: false, // @TODO description: "Copies the selected items to the Clipboard. To put them in the new location, use the Paste command.", }, { label: "&Paste", - shortcut: "Ctrl+V", + shortcutLabel: "Ctrl+V", + ariaKeyShortcuts: "Control+V", enabled: false, // @TODO description: "Inserts the items you have copied or cut into the selected location.", }, @@ -189,7 +192,8 @@ var menus = { MENU_DIVIDER, { label: "Select &All", - shortcut: "Ctrl+A", + shortcutLabel: "Ctrl+A", + ariaKeyShortcuts: "Control+A", action: function () { folder_view.select_all(); folder_view.focus(); @@ -272,7 +276,8 @@ var menus = { submenu: [ { label: "&Search", - shortcut: "Ctrl+E", + shortcutLabel: "Ctrl+E", + ariaKeyShortcuts: "Control+E", checkbox: { check: ()=> false, toggle: ()=> {}, // @TODO @@ -282,7 +287,8 @@ var menus = { }, { label: "&Favorites", - shortcut: "Ctrl+I", + shortcutLabel: "Ctrl+I", + ariaKeyShortcuts: "Control+I", checkbox: { check: ()=> false, toggle: ()=> {}, // @TODO @@ -292,7 +298,8 @@ var menus = { }, { label: "&History", - shortcut: "Ctrl+H", + shortcutLabel: "Ctrl+H", + ariaKeyShortcuts: "Control+H", checkbox: { check: ()=> false, toggle: ()=> {}, // @TODO @@ -393,7 +400,8 @@ var menus = { MENU_DIVIDER, { label: "&Refresh", - shortcut: "F5", + shortcutLabel: "F5", + ariaKeyShortcuts: "F5", action: () => { refresh(); }, @@ -409,7 +417,8 @@ var menus = { // description: "Contains commands for browsing to various pages.", { label: "&Back", - shortcut: "Alt+Left Arrow", + shortcutLabel: "Alt+Left Arrow", + ariaKeyShortcuts: "Alt+ArrowLeft", action: () => { go_back(); }, @@ -418,7 +427,8 @@ var menus = { }, { label: "&Forward", - shortcut: "Alt+Right Arrow", + shortcutLabel: "Alt+Right Arrow", + ariaKeyShortcuts: "Alt+ArrowRight", action: () => { go_forward(); }, @@ -427,7 +437,8 @@ var menus = { }, { label: "&Up One Level", - // shortcut: "Alt+Up Arrow", + // shortcutLabel: "Alt+Up Arrow", + // ariaKeyShortcuts: "Alt+ArrowUp", action: () => { go_up(); }, @@ -437,7 +448,8 @@ var menus = { MENU_DIVIDER, { label: "&Home Page", - shortcut: "Alt+Home", + shortcutLabel: "Alt+Home", + ariaKeyShortcuts: "Alt+Home", action: () => { go_home(); }, diff --git a/programs/js-solitaire/src/menus.js b/programs/js-solitaire/src/menus.js index dbd4688d..c79343c9 100644 --- a/programs/js-solitaire/src/menus.js +++ b/programs/js-solitaire/src/menus.js @@ -3,28 +3,32 @@ var menus = { "&Game": [ { label: "&Deal", - shortcut: "F2", + shortcutLabel: "F2", + ariaKeyShortcuts: "F2", action: ()=> { resetGame(); }, description: "Deal a new game", }, // Don't want to imply you can undo by showing this option // { // label: "&Undo", - // shortcut: "", + // shortcutLabel: "", + // ariaKeyShortcuts: "", // enabled: false, // action: ()=> { undo(); }, // description: "Undo last action", // }, { label: "De&ck...", - shortcut: "", + shortcutLabel: "", + ariaKeyShortcuts: "", enabled: false, action: ()=> {}, description: "Choose new deck back", }, { label: "&Options...", - shortcut: "", + shortcutLabel: "", + ariaKeyShortcuts: "", enabled: false, action: ()=> {}, description: "Change Solitaire options", @@ -32,7 +36,8 @@ var menus = { MENU_DIVIDER, { label: "E&xit", - shortcut: "", + shortcutLabel: "", + ariaKeyShortcuts: "", action: ()=> { close(); }, diff --git a/programs/minesweeper/menus.js b/programs/minesweeper/menus.js index c9b71f1b..847f8b4f 100644 --- a/programs/minesweeper/menus.js +++ b/programs/minesweeper/menus.js @@ -42,7 +42,8 @@ var menus = { "&Game": [ { label: "&New", - // shortcut: "F2", // TODO + // shortcutLabel: "F2", + // ariaKeyShortcuts: "F2", // TODO action: function(){ minesweeper_.restart(); }, diff --git a/programs/notepad/src/menus.js b/programs/notepad/src/menus.js index 4ca54efb..8b5bf8e2 100644 --- a/programs/notepad/src/menus.js +++ b/programs/notepad/src/menus.js @@ -5,25 +5,29 @@ var menus = { // also, it leaves off periods from the end of the descriptions { label: "&New", - shortcut: "Ctrl+N", + shortcutLabel: "Ctrl+N", + ariaKeyShortcuts: "Control+N", action: file_new, description: "Creates a new document.", }, { label: "&Open...", - shortcut: "Ctrl+O", + shortcutLabel: "Ctrl+O", + ariaKeyShortcuts: "Control+O", action: file_open, description: "Opens an existing document.", }, { label: "&Save", - shortcut: "Ctrl+S", + shortcutLabel: "Ctrl+S", + ariaKeyShortcuts: "Control+S", action: file_save, description: "Saves the active document.", }, { label: "Save &As...", - shortcut: "Ctrl+Shift+S", + shortcutLabel: "Ctrl+Shift+S", + ariaKeyShortcuts: "Control+Shift+S", action: file_save_as, description: "Saves the active document with a new name.", }, @@ -46,7 +50,8 @@ var menus = { }, { label: "&Print...", - shortcut: "Ctrl+P", + shortcutLabel: "Ctrl+P", + ariaKeyShortcuts: "Control+P", action: function () { print(); }, @@ -61,7 +66,8 @@ var menus = { MENU_DIVIDER, { label: "E&xit", - // shortcut: "Alt+F4", + // shortcutLabel: "Alt+F4", + // ariaKeyShortcuts: "Alt+F4", action: function () { close(); }, @@ -71,7 +77,8 @@ var menus = { "&Edit": [ { label: "&Undo", - shortcut: "Ctrl+Z", + shortcutLabel: "Ctrl+Z", + ariaKeyShortcuts: "Control+Z", enabled: function () { return document.queryCommandEnabled("undo"); }, @@ -83,7 +90,8 @@ var menus = { // NOTE: Notepad in Windows 98 doesn't actually have a separate Repeat/Redo { label: "&Repeat", - shortcut: "Ctrl+Shift+Z", //"F4", + shortcutLabel: "Ctrl+Shift+Z", //"F4", + ariaKeyShortcuts: "Control+Shift+Z", //"F4", enabled: function () { return document.queryCommandEnabled("redo"); }, @@ -98,7 +106,8 @@ var menus = { // make it so it queries the enabled status of all items before switching focus to the menus. { label: "Cu&t", - shortcut: "Ctrl+X", + shortcutLabel: "Ctrl+X", + ariaKeyShortcuts: "Control+X", enabled: function () { return document.queryCommandEnabled("cut"); }, @@ -110,7 +119,8 @@ var menus = { }, { label: "&Copy", - shortcut: "Ctrl+C", + shortcutLabel: "Ctrl+C", + ariaKeyShortcuts: "Control+C", enabled: function () { return document.queryCommandEnabled("copy"); }, @@ -122,7 +132,8 @@ var menus = { }, { label: "&Paste", - shortcut: "Ctrl+V", + shortcutLabel: "Ctrl+V", + ariaKeyShortcuts: "Control+V", enabled: function () { return document.queryCommandEnabled("paste"); }, @@ -134,7 +145,8 @@ var menus = { }, { label: "De&lete", - shortcut: "Del", + shortcutLabel: "Del", + ariaKeyShortcuts: "Delete", enabled: function () { var textarea = $textarea.get(0); var startPos = textarea.selectionStart; @@ -163,13 +175,15 @@ var menus = { { label: "Select &All", // NOTE: Notepad in Windows 98 doesn't actually have Ctrl+A as a shortcut - shortcut: "Ctrl+A", + shortcutLabel: "Ctrl+A", + ariaKeyShortcuts: "Control+A", action: select_all, description: "Selects the entire document.", }, { label: "Time/&Date", - shortcut: "F5", + shortcutLabel: "F5", + ariaKeyShortcuts: "F5", enabled: function () { return document.queryCommandEnabled("insertText"); }, @@ -196,14 +210,16 @@ var menus = { { label: "&Find...", // NOTE: Notepad in Windows 98 doesn't actually have Ctrl+F as a shortcut (although WordPad does) - shortcut: "Ctrl+F", + shortcutLabel: "Ctrl+F", + ariaKeyShortcuts: "Control+F", action: function () { }, // TODO enabled: false, description: "Finds the specified text.", }, { label: "Find &Next", - shortcut: "F3", + shortcutLabel: "F3", + ariaKeyShortcuts: "F3", action: function () { }, // TODO enabled: false, description: "Repeats the last find.", @@ -211,14 +227,16 @@ var menus = { // NOTE: Notepad in Windows 98 doesn't have Replace or Go to... options // { // label: "&Replace", - // shortcut: "Ctrl+H", + // shortcutLabel: "Ctrl+H", + // ariaKeyShortcuts: "Control+H", // action: function(){}, // enabled: false, // description: "Replaces specific text with different text.", // }, // { // label: "&Go to", - // shortcut: "Ctrl+G", + // shortcutLabel: "Ctrl+G", + // ariaKeyShortcuts: "Control+G", // action: function(){}, // enabled: false, // description: "Goes to a specified line number.", // NOTE: made up text diff --git a/programs/pinball/space-cadet-menus.js b/programs/pinball/space-cadet-menus.js index 35312f58..b4e81c15 100644 --- a/programs/pinball/space-cadet-menus.js +++ b/programs/pinball/space-cadet-menus.js @@ -236,7 +236,8 @@ var menus = { "&Game": [ { label: "&New Game", - shortcut: "F2", + shortcutLabel: "F2", + ariaKeyShortcuts: "F2", action: function () { handle_menu_item(0, 0); }, @@ -254,7 +255,8 @@ var menus = { }, { label: "&Pause/Resume Game", - shortcut: "F3", + shortcutLabel: "F3", + ariaKeyShortcuts: "F3", action: function () { handle_menu_item(0, 2); }, @@ -284,7 +286,8 @@ var menus = { "&Options": [ { label: "&Full Screen", - shortcut: "F4", + shortcutLabel: "F4", + ariaKeyShortcuts: "F4", action: function () { toggle_fullscreen(); }, @@ -354,7 +357,8 @@ var menus = { MENU_DIVIDER, { label: "P&layer Controls", - shortcut: "F8", + shortcutLabel: "F8", + ariaKeyShortcuts: "F8", action: function () { // @TODO // handle_menu_item(1, 3.2); @@ -365,7 +369,8 @@ var menus = { "&Help": [ { label: "&Help Topics", - shortcut: "F1", // @TODO + shortcutLabel: "F1", + ariaKeyShortcuts: "F1", // @TODO action: function () { /* @TODO var show_help = window.show_help; diff --git a/programs/sound-recorder/src/menus.js b/programs/sound-recorder/src/menus.js index 715cacf1..08de0b98 100644 --- a/programs/sound-recorder/src/menus.js +++ b/programs/sound-recorder/src/menus.js @@ -3,25 +3,29 @@ var menus = { "&File": [ { label: "&New", - shortcut: "Ctrl+N", + shortcutLabel: "Ctrl+N", + ariaKeyShortcuts: "Control+N", action: file_new, description: "Creates a new sound.", }, { label: "&Open", - shortcut: "Ctrl+O", + shortcutLabel: "Ctrl+O", + ariaKeyShortcuts: "Control+O", action: file_open, description: "Opens an existing sound.", }, { label: "&Save", - shortcut: "Ctrl+S", + shortcutLabel: "Ctrl+S", + ariaKeyShortcuts: "Control+S", action: file_save, description: "Saves the active sound.", }, { label: "Save &As", - shortcut: "Ctrl+Shift+S", + shortcutLabel: "Ctrl+Shift+S", + ariaKeyShortcuts: "Control+Shift+S", action: file_save_as, description: "Saves the active sound with a new name.", }, @@ -40,7 +44,8 @@ var menus = { MENU_DIVIDER, { label: "E&xit", - shortcut: "Alt+F4", + shortcutLabel: "Alt+F4", + ariaKeyShortcuts: "Alt+F4", action: function () { close(); }, @@ -51,7 +56,8 @@ var menus = { /* { label: "&Undo", - shortcut: "Ctrl+Z", + shortcutLabel: "Ctrl+Z", + ariaKeyShortcuts: "Control+Z", enabled: function(){ return undos.length >= 1; }, @@ -60,7 +66,8 @@ var menus = { }, { label: "&Repeat", - shortcut: "F4", + shortcutLabel: "F4", + ariaKeyShortcuts: "F4", enabled: function(){ return redos.length >= 1; }, @@ -70,7 +77,8 @@ var menus = { MENU_DIVIDER,*/ { label: "&Copy", - shortcut: "Ctrl+C", + shortcutLabel: "Ctrl+C", + ariaKeyShortcuts: "Control+C", enabled: function () { return (typeof chrome !== "undefined") && chrome.permissions; }, @@ -81,7 +89,8 @@ var menus = { }, { label: "&Paste Insert", - shortcut: "Ctrl+V", + shortcutLabel: "Ctrl+V", + ariaKeyShortcuts: "Control+V", enabled: function () { return (typeof chrome !== "undefined") && chrome.permissions; },