diff --git a/lib/finder-menu.js b/lib/finder-menu.js index dbc743f6..2e0f8d42 100644 --- a/lib/finder-menu.js +++ b/lib/finder-menu.js @@ -48,7 +48,7 @@ var view = { submenu: [ { label: 'Focus Search', - accelerator: 'Control + Alt + F', + accelerator: 'Control+Alt+F', click: function () { console.log('focus find') } @@ -58,7 +58,7 @@ var view = { }, { label: 'Toggle Markdown Preview', - accelerator: OSX ? 'Command + P' : 'Ctrl + P', + accelerator: OSX ? 'Command+P' : 'Control+P', click: function () { console.log('markdown') } @@ -68,10 +68,7 @@ var view = { }, { label: 'Reload', - accelerator: (function () { - if (process.platform === 'darwin') return 'Command+R' - else return 'Ctrl+R' - })(), + accelerator: OSX ? 'Command+R' : 'Control+R', click: function () { BrowserWindow.getFocusedWindow().reload() } diff --git a/lib/main-menu.js b/lib/main-menu.js index 2dfe92ea..dc273551 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -54,14 +54,14 @@ var file = { submenu: [ { label: 'New Note', - accelerator: 'CmdOrCtrl + N', + accelerator: 'CommandOrControl+N', click: function () { mainWindow.webContents.send('top:new-note') } }, { label: 'Focus Note', - accelerator: 'Control + E', + accelerator: 'Control+E', click () { mainWindow.webContents.send('detail:focus') } @@ -93,7 +93,7 @@ var file = { }, { label: 'Delete Note', - accelerator: OSX ? 'Control + Backspace' : 'Control + Delete', + accelerator: OSX ? 'Control+Backspace' : 'Control+Delete', click: function () { mainWindow.webContents.send('detail:delete') } @@ -154,14 +154,14 @@ var view = { submenu: [ { label: 'Reload', - accelerator: 'CmdOrCtrl+R', + accelerator: 'CommandOrControl+R', click: function () { BrowserWindow.getFocusedWindow().reload() } }, { label: 'Toggle Developer Tools', - accelerator: OSX ? 'Command+Alt+I' : 'Ctrl+Shift+I', + accelerator: OSX ? 'Command+Alt+I' : 'Control+Shift+I', click: function () { BrowserWindow.getFocusedWindow().toggleDevTools() } @@ -171,21 +171,21 @@ var view = { }, { label: 'Next Note', - accelerator: 'Control + J', + accelerator: 'Control+J', click () { mainWindow.webContents.send('list:next') } }, { label: 'Previous Note', - accelerator: 'Control + U', + accelerator: 'Control+U', click () { mainWindow.webContents.send('list:prior') } }, { label: 'Jump to Top', - accelerator: 'Control + G', + accelerator: 'Control+G', click () { mainWindow.webContents.send('list:jumpToTop') } @@ -195,7 +195,7 @@ var view = { }, { label: 'Focus Search', - accelerator: 'Control + S', + accelerator: 'Control+S', click () { mainWindow.webContents.send('top:focus-search') }