Simplify shortcuts. Go Back menu item

Fixes #585

main/index.js

@@ -12,7 +12,6 @@ var handlers = require('./handlers')
 var ipc = require('./ipc')
 var log = require('./log')
 var menu = require('./menu')
-var shortcuts = require('./shortcuts')
 var squirrelWin32 = require('./squirrel-win32')
 var tray = require('./tray')
 var updater = require('./updater')
@@ -64,7 +63,6 @@ function init () {
     windows.createMainWindow()
     windows.createWebTorrentHiddenWindow()
     menu.init()
-    shortcuts.init()
 
     // To keep app startup fast, some code is delayed.
     setTimeout(delayedInit, config.DELAYED_INIT)

main/menu.js

@@ -118,7 +118,15 @@ function decreasePlaybackRate () {
 
 // Open the preferences window
 function showPreferences () {
-  windows.main.send('dispatch', 'preferences')
+  if (windows.main) {
+    windows.main.send('dispatch', 'preferences')
+  }
+}
+
+function escapeBack () {
+  if (windows.main) {
+    windows.main.send('dispatch', 'escapeBack')
+  }
 }
 
 function onWindowShow () {
@@ -322,6 +330,14 @@ function getAppMenuTemplate () {
               click: showWebTorrentWindow
             }
           ]
+        },
+        {
+          type: 'separator'
+        },
+        {
+          label: 'Go Back',
+          accelerator: 'Esc',
+          click: escapeBack
         }
       ]
     },
@@ -330,7 +346,7 @@ function getAppMenuTemplate () {
       submenu: [
         {
           label: 'Play/Pause',
-          accelerator: 'CmdOrCtrl+P',
+          accelerator: 'Space',
           click: playPause,
           enabled: false
         },

main/shortcuts.js

@@ -1,26 +1,11 @@
 module.exports = {
-  init,
   onPlayerClose,
   onPlayerOpen
 }
 
 var electron = require('electron')
-
-var menu = require('./menu')
 var windows = require('./windows')
 
-function init () {
-  var localShortcut = require('electron-localshortcut')
-
-  // Alternate shortcuts. Most shortcuts are registered in menu,js, but Electron
-  // does not support multiple shortcuts for a single menu item.
-  localShortcut.register('CmdOrCtrl+Shift+F', menu.toggleFullScreen)
-  localShortcut.register('Space', () => windows.main.send('dispatch', 'playPause'))
-
-  // Hidden shortcuts, i.e. not shown in the menu
-  localShortcut.register('Esc', () => windows.main.send('dispatch', 'escapeBack'))
-}
-
 function onPlayerOpen () {
   // Register special "media key" for play/pause, available on some keyboards
   electron.globalShortcut.register(