Merge pull request electron#6012 from miniak/menu-item-roles

zcbenz · web-flow · commit 04479b40a78c · 2016-06-13T06:21:53.000Z
Document 'zoom' role + add missing menu items (Delete / Paste and Match Style / Zoom)
diff --git a/default_app/main.js b/default_app/main.js
@@ -80,6 +80,15 @@ app.once('ready', () => {
           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',
@@ -210,15 +219,29 @@ app.once('ready', () => {
         }
       ]
     })
-    template[3].submenu.push(
+    template[3].submenu = [
+      {
+        label: 'Close',
+        accelerator: 'CmdOrCtrl+W',
+        role: 'close'
+      },
+      {
+        label: 'Minimize',
+        accelerator: 'CmdOrCtrl+M',
+        role: 'minimize'
+      },
+      {
+        label: 'Zoom',
+        role: 'zoom'
+      },
       {
         type: 'separator'
       },
       {
         label: 'Bring All to Front',
         role: 'front'
       }
-    )
+    ]
   }
 
   const menu = Menu.buildFromTemplate(template)
diff --git a/docs/api/menu-item.md b/docs/api/menu-item.md
@@ -59,6 +59,7 @@ On OS X `role` can also have following additional values:
 * `hideothers` - Map to the `hideOtherApplications` action
 * `unhide` - Map to the `unhideAllApplications` action
 * `front` - Map to the `arrangeInFront` action
+* `zoom` - Map to the `performZoom` action
 * `window` - The submenu is a "Window" menu
 * `help` - The submenu is a "Help" menu
 * `services` - The submenu is a "Services" menu
diff --git a/docs/api/menu.md b/docs/api/menu.md
@@ -66,6 +66,15 @@ const template = [
         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',
@@ -174,15 +183,29 @@ if (process.platform === 'darwin') {
     ]
   });
   // Window menu.
-  template[3].submenu.push(
+  template[3].submenu = [
+    {
+      label: 'Close',
+      accelerator: 'CmdOrCtrl+W',
+      role: 'close'
+    },
+    {
+      label: 'Minimize',
+      accelerator: 'CmdOrCtrl+M',
+      role: 'minimize'
+    },
+    {
+      label: 'Zoom',
+      role: 'zoom'
+    },
     {
       type: 'separator'
     },
     {
       label: 'Bring All to Front',
       role: 'front'
     }
-  );
+  ];
 }
 
 const menu = Menu.buildFromTemplate(template);
