Simplify OSX accelerators (see here: http://electron.atom.io/docs/api/accelerator/#platform-notice)

bkjohnson · bkjohnson · commit cd5bc4e93089 · 2016-10-26T19:51:35.000-05:00
diff --git a/lib/main-menu.js b/lib/main-menu.js
@@ -54,7 +54,7 @@ var file = {
   submenu: [
     {
       label: 'New Note',
-      accelerator: OSX ? 'Command + N' : 'Control + N',
+      accelerator: 'CmdOrCtrl + N',
       click: function () {
         mainWindow.webContents.send('top:new-note')
       }
@@ -125,7 +125,7 @@ var view = {
   submenu: [
     {
       label: 'Reload',
-      accelerator: OSX ? 'Command+R' : 'Ctrl+R',
+      accelerator: 'CmdOrCtrl+R',
       click: function () {
         BrowserWindow.getFocusedWindow().reload()
       }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ var file = {`
`54`	`54`	`submenu: [`
`55`	`55`	`{`
`56`	`56`	`label: 'New Note',`
`57`		`- accelerator: OSX ? 'Command + N' : 'Control + N',`
	`57`	`+ accelerator: 'CmdOrCtrl + N',`
`58`	`58`	`click: function () {`
`59`	`59`	`mainWindow.webContents.send('top:new-note')`
`60`	`60`	`}`
`@@ -125,7 +125,7 @@ var view = {`
`125`	`125`	`submenu: [`
`126`	`126`	`{`
`127`	`127`	`label: 'Reload',`
`128`		`- accelerator: OSX ? 'Command+R' : 'Ctrl+R',`
	`128`	`+ accelerator: 'CmdOrCtrl+R',`
`129`	`129`	`click: function () {`
`130`	`130`	`BrowserWindow.getFocusedWindow().reload()`
`131`	`131`	`}`