Merge pull request #6190 from electron/default-label-and-accelerator

Add default label and accelerator for menu item roles

docs/api/menu-item.md

@@ -39,6 +39,9 @@ It is best to specify `role` for any menu item that matches a standard role,
 rather than trying to manually implement the behavior in a `click` function.
 The built-in `role` behavior will give the best native experience.
 
+The `label` and `accelerator` are optional when using a `role` and will default
+to appropriate values for each platform.
+
 The `role` property can have following values:
 
 * `undo`

docs/api/menu.md

@@ -39,45 +39,30 @@ const template = [
     label: 'Edit',
     submenu: [
       {
-        label: 'Undo',
-        accelerator: 'CmdOrCtrl+Z',
         role: 'undo'
       },
       {
-        label: 'Redo',
-        accelerator: 'Shift+CmdOrCtrl+Z',
         role: 'redo'
       },
       {
         type: 'separator'
       },
       {
-        label: 'Cut',
-        accelerator: 'CmdOrCtrl+X',
         role: 'cut'
       },
       {
-        label: 'Copy',
-        accelerator: 'CmdOrCtrl+C',
         role: 'copy'
       },
       {
-        label: 'Paste',
-        accelerator: 'CmdOrCtrl+V',
         role: 'paste'
       },
       {
-        label: 'Paste and Match Style',
-        accelerator: 'Shift+Command+V',
         role: 'pasteandmatchstyle'
       },
       {
-        label: 'Delete',
         role: 'delete'
       },
       {
-        label: 'Select All',
-        accelerator: 'CmdOrCtrl+A',
         role: 'selectall'
       },
     ]
@@ -93,12 +78,7 @@ const template = [
         }
       },
       {
-        label: 'Toggle Full Screen',
-        accelerator: process.platform === 'darwin' ? 'Ctrl+Command+F' : 'F11',
-        click(item, focusedWindow) {
-          if (focusedWindow)
-            focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
-        }
+        role: 'togglefullscreen'
       },
       {
         label: 'Toggle Developer Tools',
@@ -111,23 +91,17 @@ const template = [
     ]
   },
   {
-    label: 'Window',
     role: 'window',
     submenu: [
       {
-        label: 'Minimize',
-        accelerator: 'CmdOrCtrl+M',
         role: 'minimize'
       },
       {
-        label: 'Close',
-        accelerator: 'CmdOrCtrl+W',
         role: 'close'
       },
     ]
   },
   {
-    label: 'Help',
     role: 'help',
     submenu: [
       {
@@ -144,14 +118,12 @@ if (process.platform === 'darwin') {
     label: name,
     submenu: [
       {
-        label: 'About ' + name,
         role: 'about'
       },
       {
         type: 'separator'
       },
       {
-        label: 'Services',
         role: 'services',
         submenu: []
       },
@@ -159,26 +131,19 @@ if (process.platform === 'darwin') {
         type: 'separator'
       },
       {
-        label: 'Hide ' + name,
-        accelerator: 'Command+H',
         role: 'hide'
       },
       {
-        label: 'Hide Others',
-        accelerator: 'Command+Alt+H',
         role: 'hideothers'
       },
       {
-        label: 'Show All',
         role: 'unhide'
       },
       {
         type: 'separator'
       },
       {
-        label: 'Quit',
-        accelerator: 'Command+Q',
-        click() { app.quit(); }
+        role: 'quit'
       },
     ]
   });