Perf: Use electron.* getter inline, rather than upfront

This commit is contained in:
Feross Aboukhadijeh
2016-05-11 22:12:37 +02:00
parent 39195fe8c4
commit b1a7543d37
3 changed files with 14 additions and 18 deletions

View File

@@ -6,7 +6,6 @@ var electron = require('electron')
var app = electron.app var app = electron.app
var ipcMain = electron.ipcMain var ipcMain = electron.ipcMain
var powerSaveBlocker = electron.powerSaveBlocker
var log = require('./log') var log = require('./log')
var menu = require('./menu') var menu = require('./menu')
@@ -15,7 +14,7 @@ var shortcuts = require('./shortcuts')
var vlc = require('./vlc') var vlc = require('./vlc')
// has to be a number, not a boolean, and undefined throws an error // 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 // messages from the main process, to be sent once the WebTorrent process starts
var messageQueueMainToWebTorrent = [] var messageQueueMainToWebTorrent = []
@@ -229,13 +228,13 @@ function setProgress (progress) {
} }
function blockPowerSave () { function blockPowerSave () {
powerSaveBlockID = powerSaveBlocker.start('prevent-display-sleep') powerSaveBlockerId = electron.powerSaveBlocker.start('prevent-display-sleep')
log('blockPowerSave %d', powerSaveBlockID) log('blockPowerSave %d', powerSaveBlockerId)
} }
function unblockPowerSave () { function unblockPowerSave () {
if (powerSaveBlocker.isStarted(powerSaveBlockID)) { if (electron.powerSaveBlocker.isStarted(powerSaveBlockerId)) {
powerSaveBlocker.stop(powerSaveBlockID) electron.powerSaveBlocker.stop(powerSaveBlockerId)
log('unblockPowerSave %d', powerSaveBlockID) log('unblockPowerSave %d', powerSaveBlockerId)
} }
} }

View File

@@ -5,16 +5,15 @@ module.exports = {
} }
var electron = require('electron') var electron = require('electron')
var localShortcut = require('electron-localshortcut')
var globalShortcut = electron.globalShortcut
var menu = require('./menu') var menu = require('./menu')
var windows = require('./windows') var windows = require('./windows')
function init () { function init () {
// Alternate shortcuts. Most shortcuts are registered in menu,js, but Electron does not var localShortcut = require('electron-localshortcut')
// support multiple shortcuts for a single menu item.
// 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('CmdOrCtrl+Shift+F', menu.toggleFullScreen)
localShortcut.register('Space', () => windows.main.send('dispatch', 'playPause')) localShortcut.register('Space', () => windows.main.send('dispatch', 'playPause'))
@@ -24,12 +23,12 @@ function init () {
function onPlayerOpen () { function onPlayerOpen () {
// Register special "media key" for play/pause, available on some keyboards // Register special "media key" for play/pause, available on some keyboards
globalShortcut.register( electron.globalShortcut.register(
'MediaPlayPause', 'MediaPlayPause',
() => windows.main.send('dispatch', 'playPause') () => windows.main.send('dispatch', 'playPause')
) )
} }
function onPlayerClose () { function onPlayerClose () {
globalShortcut.unregister('MediaPlayPause') electron.globalShortcut.unregister('MediaPlayPause')
} }

View File

@@ -8,8 +8,6 @@ var path = require('path')
var electron = require('electron') var electron = require('electron')
var app = electron.app var app = electron.app
var Menu = electron.Menu
var Tray = electron.Tray
var windows = require('./windows') var windows = require('./windows')
@@ -35,7 +33,7 @@ function hasTray () {
} }
function createTrayIcon () { 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 Windows, left click to open the app, right click for context menu
// On Linux, any click (right or left) opens the context menu // On Linux, any click (right or left) opens the context menu
@@ -66,7 +64,7 @@ function updateTrayMenu () {
} else { } else {
showHideMenuItem = { label: 'Show', click: showApp } showHideMenuItem = { label: 'Show', click: showApp }
} }
var contextMenu = Menu.buildFromTemplate([ var contextMenu = electron.Menu.buildFromTemplate([
showHideMenuItem, showHideMenuItem,
{ label: 'Quit', click: () => app.quit() } { label: 'Quit', click: () => app.quit() }
]) ])