Merge pull request electron#6168 from electron/forward-delete

zcbenz · web-flow · commit c0aebc9d4f3f · 2016-06-22T01:12:10.000Z
Support forward delete menu item accelerator
diff --git a/atom/browser/ui/accelerator_util_mac.mm b/atom/browser/ui/accelerator_util_mac.mm
@@ -29,6 +29,10 @@ void SetPlatformAccelerator(ui::Accelerator* accelerator) {
     modifiers ^= NSShiftKeyMask;
   }
 
+  if (character == NSDeleteFunctionKey) {
+    character = NSDeleteCharacter;
+  }
+
   NSString* characters =
       [[[NSString alloc] initWithCharacters:&character length:1] autorelease];
 
diff --git a/default_app/main.js b/default_app/main.js
@@ -86,6 +86,7 @@ app.once('ready', () => {
         },
         {
           label: 'Delete',
+          accelerator: 'Delete',
           role: 'delete'
         },
         {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,10 @@ void SetPlatformAccelerator(ui::Accelerator* accelerator) {`
`29`	`29`	`modifiers ^= NSShiftKeyMask;`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ if (character == NSDeleteFunctionKey) {`
	`33`	`+ character = NSDeleteCharacter;`
	`34`	`+ }`
	`35`	`+`
`32`	`36`	`NSString* characters =`
`33`	`37`	`[[[NSString alloc] initWithCharacters:&character length:1] autorelease];`
`34`	`38`