From b1a7543d37c6924625b611cab0cdbc68565d4caf Mon Sep 17 00:00:00 2001
From: Feross Aboukhadijeh <feross@feross.org>
Date: Wed, 11 May 2016 22:12:37 +0200
Subject: [PATCH] Perf: Use electron.* getter inline, rather than upfront

---
 main/ipc.js       | 13 ++++++-------
 main/shortcuts.js | 13 ++++++-------
 main/tray.js      |  6 ++----
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/main/ipc.js b/main/ipc.js
index ed3c59c6..5f322190 100644
--- a/main/ipc.js
+++ b/main/ipc.js
@@ -6,7 +6,6 @@ var electron = require('electron')
 
 var app = electron.app
 var ipcMain = electron.ipcMain
-var powerSaveBlocker = electron.powerSaveBlocker
 
 var log = require('./log')
 var menu = require('./menu')
@@ -15,7 +14,7 @@ var shortcuts = require('./shortcuts')
 var vlc = require('./vlc')
 
 // has to be a number, not a boolean, and undefined throws an error
-var powerSaveBlockID = 0
+var powerSaveBlockerId = 0
 
 // messages from the main process, to be sent once the WebTorrent process starts
 var messageQueueMainToWebTorrent = []
@@ -229,13 +228,13 @@ function setProgress (progress) {
 }
 
 function blockPowerSave () {
-  powerSaveBlockID = powerSaveBlocker.start('prevent-display-sleep')
-  log('blockPowerSave %d', powerSaveBlockID)
+  powerSaveBlockerId = electron.powerSaveBlocker.start('prevent-display-sleep')
+  log('blockPowerSave %d', powerSaveBlockerId)
 }
 
 function unblockPowerSave () {
-  if (powerSaveBlocker.isStarted(powerSaveBlockID)) {
-    powerSaveBlocker.stop(powerSaveBlockID)
-    log('unblockPowerSave %d', powerSaveBlockID)
+  if (electron.powerSaveBlocker.isStarted(powerSaveBlockerId)) {
+    electron.powerSaveBlocker.stop(powerSaveBlockerId)
+    log('unblockPowerSave %d', powerSaveBlockerId)
   }
 }
diff --git a/main/shortcuts.js b/main/shortcuts.js
index 739f72eb..ee21fb2a 100644
--- a/main/shortcuts.js
+++ b/main/shortcuts.js
@@ -5,16 +5,15 @@ module.exports = {
 }
 
 var electron = require('electron')
-var localShortcut = require('electron-localshortcut')
-
-var globalShortcut = electron.globalShortcut
 
 var menu = require('./menu')
 var windows = require('./windows')
 
 function init () {
-  // Alternate shortcuts. Most shortcuts are registered in menu,js, but Electron does not
-  // support multiple shortcuts for a single menu item.
+  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'))
 
@@ -24,12 +23,12 @@ function init () {
 
 function onPlayerOpen () {
   // Register special "media key" for play/pause, available on some keyboards
-  globalShortcut.register(
+  electron.globalShortcut.register(
     'MediaPlayPause',
     () => windows.main.send('dispatch', 'playPause')
   )
 }
 
 function onPlayerClose () {
-  globalShortcut.unregister('MediaPlayPause')
+  electron.globalShortcut.unregister('MediaPlayPause')
 }
diff --git a/main/tray.js b/main/tray.js
index fa81f951..ad7132d5 100644
--- a/main/tray.js
+++ b/main/tray.js
@@ -8,8 +8,6 @@ var path = require('path')
 var electron = require('electron')
 
 var app = electron.app
-var Menu = electron.Menu
-var Tray = electron.Tray
 
 var windows = require('./windows')
 
@@ -35,7 +33,7 @@ function hasTray () {
 }
 
 function createTrayIcon () {
-  trayIcon = new Tray(path.join(__dirname, '..', 'static', 'WebTorrentSmall.png'))
+  trayIcon = new electron.Tray(path.join(__dirname, '..', 'static', 'WebTorrentSmall.png'))
 
   // On Windows, left click to open the app, right click for context menu
   // On Linux, any click (right or left) opens the context menu
@@ -66,7 +64,7 @@ function updateTrayMenu () {
   } else {
     showHideMenuItem = { label: 'Show', click: showApp }
   }
-  var contextMenu = Menu.buildFromTemplate([
+  var contextMenu = electron.Menu.buildFromTemplate([
     showHideMenuItem,
     { label: 'Quit', click: () => app.quit() }
   ])