Style: no more var

This commit is contained in:
DC
2016-08-31 14:36:11 -07:00
parent 0bda5358bd
commit 3f6cc97a02
54 changed files with 676 additions and 679 deletions

View File

@@ -2,12 +2,12 @@ module.exports = {
init
}
var electron = require('electron')
const electron = require('electron')
var config = require('../config')
var log = require('./log')
const config = require('../config')
const log = require('./log')
var ANNOUNCEMENT_URL = config.ANNOUNCEMENT_URL +
const ANNOUNCEMENT_URL = config.ANNOUNCEMENT_URL +
'?version=' + config.APP_VERSION +
'&platform=' + process.platform
@@ -26,7 +26,7 @@ var ANNOUNCEMENT_URL = config.ANNOUNCEMENT_URL +
* }
*/
function init () {
var get = require('simple-get')
const get = require('simple-get')
get.concat(ANNOUNCEMENT_URL, onResponse)
}

View File

@@ -6,10 +6,10 @@ module.exports = {
openFiles
}
var electron = require('electron')
const electron = require('electron')
var log = require('./log')
var windows = require('./windows')
const log = require('./log')
const windows = require('./windows')
/**
* Show open dialog to create a single-file torrent.
@@ -17,7 +17,7 @@ var windows = require('./windows')
function openSeedFile () {
if (!windows.main.win) return
log('openSeedFile')
var opts = {
const opts = {
title: 'Select a file for the torrent.',
properties: [ 'openFile' ]
}
@@ -37,7 +37,7 @@ function openSeedFile () {
function openSeedDirectory () {
if (!windows.main.win) return
log('openSeedDirectory')
var opts = process.platform === 'darwin'
const opts = process.platform === 'darwin'
? {
title: 'Select a file or folder for the torrent.',
properties: [ 'openFile', 'openDirectory' ]
@@ -61,7 +61,7 @@ function openSeedDirectory () {
function openFiles () {
if (!windows.main.win) return
log('openFiles')
var opts = process.platform === 'darwin'
const opts = process.platform === 'darwin'
? {
title: 'Select a file or folder to add.',
properties: [ 'openFile', 'openDirectory' ]
@@ -84,7 +84,7 @@ function openFiles () {
function openTorrentFile () {
if (!windows.main.win) return
log('openTorrentFile')
var opts = {
const opts = {
title: 'Select a .torrent file.',
filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
properties: [ 'openFile', 'multiSelections' ]

View File

@@ -4,17 +4,17 @@ module.exports = {
setBadge
}
var {app, Menu} = require('electron')
const {app, Menu} = require('electron')
var dialog = require('./dialog')
var log = require('./log')
const dialog = require('./dialog')
const log = require('./log')
/**
* Add a right-click menu to the dock icon. (Mac)
*/
function init () {
if (!app.dock) return
var menu = Menu.buildFromTemplate(getMenuTemplate())
const menu = Menu.buildFromTemplate(getMenuTemplate())
app.dock.setMenu(menu)
}

View File

@@ -4,14 +4,14 @@ module.exports = {
checkInstall
}
var cp = require('child_process')
var vlcCommand = require('vlc-command')
const cp = require('child_process')
const vlcCommand = require('vlc-command')
var log = require('./log')
var windows = require('./windows')
const log = require('./log')
const windows = require('./windows')
// holds a ChildProcess while we're playing a video in an external player, null otherwise
var proc
let proc = null
function checkInstall (path, cb) {
// check for VLC if external player has not been specified by the user
@@ -26,7 +26,7 @@ function spawn (path, url, title) {
// Try to find and use VLC if external player is not specified
vlcCommand(function (err, vlcPath) {
if (err) return windows.main.dispatch('externalPlayerNotFound')
var args = [
const args = [
'--play-and-exit',
'--video-on-top',
'--quiet',
@@ -50,7 +50,7 @@ function spawnExternal (path, args) {
proc = cp.spawn(path, args, {stdio: 'ignore'})
// If it works, close the modal after a second
var closeModalTimeout = setTimeout(() =>
const closeModalTimeout = setTimeout(() =>
windows.main.dispatch('exitModal'), 1000)
proc.on('close', function (code) {

View File

@@ -3,8 +3,8 @@ module.exports = {
uninstall
}
var config = require('../config')
var path = require('path')
const config = require('../config')
const path = require('path')
function install () {
if (process.platform === 'darwin') {
@@ -31,8 +31,8 @@ function uninstall () {
}
function installDarwin () {
var electron = require('electron')
var app = electron.app
const electron = require('electron')
const app = electron.app
// On Mac, only protocols that are listed in `Info.plist` can be set as the
// default handler at runtime.
@@ -44,18 +44,18 @@ function installDarwin () {
function uninstallDarwin () {}
var EXEC_COMMAND = [ process.execPath ]
const EXEC_COMMAND = [ process.execPath ]
if (!config.IS_PRODUCTION) {
EXEC_COMMAND.push(config.ROOT_PATH)
}
function installWin32 () {
var Registry = require('winreg')
const Registry = require('winreg')
var log = require('./log')
const log = require('./log')
var iconPath = path.join(
const iconPath = path.join(
process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico'
)
registerProtocolHandlerWin32(
@@ -100,7 +100,7 @@ function installWin32 () {
*/
function registerProtocolHandlerWin32 (protocol, name, icon, command) {
var protocolKey = new Registry({
const protocolKey = new Registry({
hive: Registry.HKCU, // HKEY_CURRENT_USER
key: '\\Software\\Classes\\' + protocol
})
@@ -120,7 +120,7 @@ function installWin32 () {
function setIcon (err) {
if (err) log.error(err.message)
var iconKey = new Registry({
const iconKey = new Registry({
hive: Registry.HKCU,
key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
})
@@ -130,7 +130,7 @@ function installWin32 () {
function setCommand (err) {
if (err) log.error(err.message)
var commandKey = new Registry({
const commandKey = new Registry({
hive: Registry.HKCU,
key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
})
@@ -161,7 +161,7 @@ function installWin32 () {
setExt()
function setExt () {
var extKey = new Registry({
const extKey = new Registry({
hive: Registry.HKCU, // HKEY_CURRENT_USER
key: '\\Software\\Classes\\' + ext
})
@@ -171,7 +171,7 @@ function installWin32 () {
function setId (err) {
if (err) log.error(err.message)
var idKey = new Registry({
const idKey = new Registry({
hive: Registry.HKCU,
key: '\\Software\\Classes\\' + id
})
@@ -181,7 +181,7 @@ function installWin32 () {
function setIcon (err) {
if (err) log.error(err.message)
var iconKey = new Registry({
const iconKey = new Registry({
hive: Registry.HKCU,
key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
})
@@ -191,7 +191,7 @@ function installWin32 () {
function setCommand (err) {
if (err) log.error(err.message)
var commandKey = new Registry({
const commandKey = new Registry({
hive: Registry.HKCU,
key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
})
@@ -205,7 +205,7 @@ function installWin32 () {
}
function uninstallWin32 () {
var Registry = require('winreg')
const Registry = require('winreg')
unregisterProtocolHandlerWin32('magnet', EXEC_COMMAND)
unregisterProtocolHandlerWin32('stream-magnet', EXEC_COMMAND)
@@ -215,7 +215,7 @@ function uninstallWin32 () {
getCommand()
function getCommand () {
var commandKey = new Registry({
const commandKey = new Registry({
hive: Registry.HKCU, // HKEY_CURRENT_USER
key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
})
@@ -227,7 +227,7 @@ function uninstallWin32 () {
}
function destroyProtocol () {
var protocolKey = new Registry({
const protocolKey = new Registry({
hive: Registry.HKCU,
key: '\\Software\\Classes\\' + protocol
})
@@ -239,7 +239,7 @@ function uninstallWin32 () {
eraseId()
function eraseId () {
var idKey = new Registry({
const idKey = new Registry({
hive: Registry.HKCU, // HKEY_CURRENT_USER
key: '\\Software\\Classes\\' + id
})
@@ -247,7 +247,7 @@ function uninstallWin32 () {
}
function getExt () {
var extKey = new Registry({
const extKey = new Registry({
hive: Registry.HKCU,
key: '\\Software\\Classes\\' + ext
})
@@ -259,7 +259,7 @@ function uninstallWin32 () {
}
function destroyExt () {
var extKey = new Registry({
const extKey = new Registry({
hive: Registry.HKCU, // HKEY_CURRENT_USER
key: '\\Software\\Classes\\' + ext
})
@@ -273,12 +273,12 @@ function commandToArgs (command) {
}
function installLinux () {
var fs = require('fs-extra')
var os = require('os')
var path = require('path')
const fs = require('fs-extra')
const os = require('os')
const path = require('path')
var config = require('../config')
var log = require('./log')
const config = require('../config')
const log = require('./log')
// Do not install in user dir if running on system
if (/^\/opt/.test(process.execPath)) return
@@ -287,7 +287,7 @@ function installLinux () {
installIconFile()
function installDesktopFile () {
var templatePath = path.join(
const templatePath = path.join(
config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop'
)
fs.readFile(templatePath, 'utf8', writeDesktopFile)
@@ -296,7 +296,7 @@ function installLinux () {
function writeDesktopFile (err, desktopFile) {
if (err) return log.error(err.message)
var appPath = config.IS_PRODUCTION
const appPath = config.IS_PRODUCTION
? path.dirname(process.execPath)
: config.ROOT_PATH
@@ -305,7 +305,7 @@ function installLinux () {
desktopFile = desktopFile.replace(/\$EXEC_PATH/g, EXEC_COMMAND.join(' '))
desktopFile = desktopFile.replace(/\$TRY_EXEC_PATH/g, process.execPath)
var desktopFilePath = path.join(
const desktopFilePath = path.join(
os.homedir(),
'.local',
'share',
@@ -319,14 +319,14 @@ function installLinux () {
}
function installIconFile () {
var iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
const iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
fs.readFile(iconStaticPath, writeIconFile)
}
function writeIconFile (err, iconFile) {
if (err) return log.error(err.message)
var iconFilePath = path.join(
const iconFilePath = path.join(
os.homedir(),
'.local',
'share',
@@ -341,11 +341,11 @@ function installLinux () {
}
function uninstallLinux () {
var os = require('os')
var path = require('path')
var fs = require('fs-extra')
const os = require('os')
const path = require('path')
const fs = require('fs-extra')
var desktopFilePath = path.join(
const desktopFilePath = path.join(
os.homedir(),
'.local',
'share',
@@ -354,7 +354,7 @@ function uninstallLinux () {
)
fs.removeSync(desktopFilePath)
var iconFilePath = path.join(
const iconFilePath = path.join(
os.homedir(),
'.local',
'share',

View File

@@ -1,26 +1,26 @@
console.time('init')
var electron = require('electron')
const electron = require('electron')
var app = electron.app
var ipcMain = electron.ipcMain
const app = electron.app
const ipcMain = electron.ipcMain
var announcement = require('./announcement')
var config = require('../config')
var crashReporter = require('../crash-reporter')
var dialog = require('./dialog')
var dock = require('./dock')
var ipc = require('./ipc')
var log = require('./log')
var menu = require('./menu')
var squirrelWin32 = require('./squirrel-win32')
var tray = require('./tray')
var updater = require('./updater')
var userTasks = require('./user-tasks')
var windows = require('./windows')
const announcement = require('./announcement')
const config = require('../config')
const crashReporter = require('../crash-reporter')
const dialog = require('./dialog')
const dock = require('./dock')
const ipc = require('./ipc')
const log = require('./log')
const menu = require('./menu')
const squirrelWin32 = require('./squirrel-win32')
const tray = require('./tray')
const updater = require('./updater')
const userTasks = require('./user-tasks')
const windows = require('./windows')
var shouldQuit = false
var argv = sliceArgv(process.argv)
let shouldQuit = false
let argv = sliceArgv(process.argv)
if (config.IS_PRODUCTION) {
// When Electron is running in production mode (packaged app), then run React
@@ -51,7 +51,7 @@ function init () {
app.setPath('userData', config.CONFIG_PATH)
}
var isReady = false // app ready, windows can be created
let isReady = false // app ready, windows can be created
app.ipcReady = false // main window has finished loading and IPC is ready
app.isQuitting = false
@@ -78,7 +78,7 @@ function init () {
// Report uncaught exceptions
process.on('uncaughtException', (err) => {
console.error(err)
var error = {message: err.message, stack: err.stack}
const error = {message: err.message, stack: err.stack}
windows.main.dispatch('uncaughtError', 'main', error)
})
})
@@ -148,7 +148,7 @@ function sliceArgv (argv) {
}
function processArgv (argv) {
var torrentIds = []
let torrentIds = []
argv.forEach(function (arg) {
if (arg === '-n') {
dialog.openSeedDirectory()

View File

@@ -2,27 +2,27 @@ module.exports = {
init
}
var electron = require('electron')
const electron = require('electron')
var app = electron.app
const app = electron.app
var dialog = require('./dialog')
var dock = require('./dock')
var handlers = require('./handlers')
var log = require('./log')
var menu = require('./menu')
var powerSaveBlocker = require('./power-save-blocker')
var shell = require('./shell')
var shortcuts = require('./shortcuts')
var externalPlayer = require('./external-player')
var windows = require('./windows')
var thumbar = require('./thumbar')
const dialog = require('./dialog')
const dock = require('./dock')
const handlers = require('./handlers')
const log = require('./log')
const menu = require('./menu')
const powerSaveBlocker = require('./power-save-blocker')
const shell = require('./shell')
const shortcuts = require('./shortcuts')
const externalPlayer = require('./external-player')
const windows = require('./windows')
const thumbar = require('./thumbar')
// Messages from the main process, to be sent once the WebTorrent process starts
var messageQueueMainToWebTorrent = []
const messageQueueMainToWebTorrent = []
function init () {
var ipc = electron.ipcMain
const ipc = electron.ipcMain
ipc.once('ipcReady', function (e) {
app.ipcReady = true
@@ -106,7 +106,7 @@ function init () {
* Windows: Main
*/
var main = windows.main
const main = windows.main
ipc.on('setAspectRatio', (e, ...args) => main.setAspectRatio(...args))
ipc.on('setBounds', (e, ...args) => main.setBounds(...args))
@@ -130,7 +130,7 @@ function init () {
ipc.on('quitExternalPlayer', () => externalPlayer.kill())
// Capture all events
var oldEmit = ipc.emit
const oldEmit = ipc.emit
ipc.emit = function (name, e, ...args) {
// Relay messages between the main window and the WebTorrent hidden window
if (name.startsWith('wt-') && !app.isQuitting) {

View File

@@ -8,10 +8,10 @@ module.exports.error = error
* where they can be viewed in Developer Tools.
*/
var electron = require('electron')
var windows = require('./windows')
const electron = require('electron')
const windows = require('./windows')
var app = electron.app
const app = electron.app
function log (...args) {
if (app.ipcReady) {

View File

@@ -8,16 +8,16 @@ module.exports = {
onToggleFullScreen
}
var electron = require('electron')
const electron = require('electron')
var app = electron.app
const app = electron.app
var config = require('../config')
var dialog = require('./dialog')
var shell = require('./shell')
var windows = require('./windows')
const config = require('../config')
const dialog = require('./dialog')
const shell = require('./shell')
const windows = require('./windows')
var menu
let menu = null
function init () {
menu = electron.Menu.buildFromTemplate(getMenuTemplate())
@@ -72,8 +72,8 @@ function onToggleFullScreen (flag) {
}
function getMenuItem (label) {
for (var i = 0; i < menu.items.length; i++) {
var menuItem = menu.items[i].submenu.items.find(function (item) {
for (let i = 0; i < menu.items.length; i++) {
const menuItem = menu.items[i].submenu.items.find(function (item) {
return item.label === label
})
if (menuItem) return menuItem
@@ -81,7 +81,7 @@ function getMenuItem (label) {
}
function getMenuTemplate () {
var template = [
const template = [
{
label: 'File',
submenu: [

View File

@@ -3,10 +3,10 @@ module.exports = {
disable
}
var electron = require('electron')
var log = require('./log')
const electron = require('electron')
const log = require('./log')
var blockId = 0
let blockId = 0
/**
* Block the system from entering low-power (sleep) mode or turning off the

View File

@@ -5,8 +5,8 @@ module.exports = {
moveItemToTrash
}
var electron = require('electron')
var log = require('./log')
const electron = require('electron')
const log = require('./log')
/**
* Open the given external protocol URL in the desktops default manner.

View File

@@ -3,8 +3,8 @@ module.exports = {
enable
}
var electron = require('electron')
var windows = require('./windows')
const electron = require('electron')
const windows = require('./windows')
function enable () {
// Register play/pause media key, available on some keyboards.

View File

@@ -2,18 +2,18 @@ module.exports = {
handleEvent
}
var cp = require('child_process')
var electron = require('electron')
var fs = require('fs')
var os = require('os')
var path = require('path')
const cp = require('child_process')
const electron = require('electron')
const fs = require('fs')
const os = require('os')
const path = require('path')
var app = electron.app
const app = electron.app
var handlers = require('./handlers')
const handlers = require('./handlers')
var EXE_NAME = path.basename(process.execPath)
var UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
const EXE_NAME = path.basename(process.execPath)
const UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
function handleEvent (cmd) {
if (cmd === '--squirrel-install') {
@@ -73,9 +73,9 @@ function handleEvent (cmd) {
* the output from standard out.
*/
function spawn (command, args, cb) {
var stdout = ''
var child
let stdout = ''
let error = null
let child = null
try {
child = cp.spawn(command, args)
} catch (err) {
@@ -90,10 +90,10 @@ function spawn (command, args, cb) {
stdout += data
})
var error = null
child.on('error', function (processError) {
error = processError
})
child.on('close', function (code, signal) {
if (code !== 0 && !error) error = new Error('Command failed: #{signal || code}')
if (error) error.stdout = stdout
@@ -122,12 +122,12 @@ function createShortcuts (cb) {
* command.
*/
function updateShortcuts (cb) {
var homeDir = os.homedir()
const homeDir = os.homedir()
if (homeDir) {
var desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
const desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
// If the desktop shortcut was deleted by the user, then keep it deleted.
fs.access(desktopShortcutPath, function (err) {
var desktopShortcutExists = !err
const desktopShortcutExists = !err
createShortcuts(function () {
if (desktopShortcutExists) {
cb()

View File

@@ -12,10 +12,10 @@ module.exports = {
* or activating the window.
*/
var path = require('path')
var config = require('../config')
const path = require('path')
const config = require('../config')
var windows = require('./windows')
const windows = require('./windows')
const PREV_ICON = path.join(config.STATIC_PATH, 'PreviousTrackThumbnailBarButton.png')
const PLAY_ICON = path.join(config.STATIC_PATH, 'PlayThumbnailBarButton.png')
@@ -27,7 +27,7 @@ const PREV = 0
const PLAY_PAUSE = 1
const NEXT = 2
var buttons = []
let buttons = []
/**
* Show the Windows thumbnail toolbar buttons.

View File

@@ -4,14 +4,14 @@ module.exports = {
setWindowFocus
}
var electron = require('electron')
const electron = require('electron')
var app = electron.app
const app = electron.app
var config = require('../config')
var windows = require('./windows')
const config = require('../config')
const windows = require('./windows')
var tray
let tray
function init () {
if (process.platform === 'linux') {
@@ -49,7 +49,7 @@ function initWin32 () {
* Check for libappindicator1 support before creating tray icon
*/
function checkLinuxTraySupport (cb) {
var cp = require('child_process')
const cp = require('child_process')
// Check that we're on Ubuntu (or another debian system) and that we have
// libappindicator1. If WebTorrent was installed from the deb file, we should
@@ -74,7 +74,7 @@ function createTray () {
}
function updateTrayMenu () {
var contextMenu = electron.Menu.buildFromTemplate(getMenuTemplate())
const contextMenu = electron.Menu.buildFromTemplate(getMenuTemplate())
tray.setContextMenu(contextMenu)
}

View File

@@ -2,14 +2,14 @@ module.exports = {
init
}
var electron = require('electron')
var get = require('simple-get')
const electron = require('electron')
const get = require('simple-get')
var config = require('../config')
var log = require('./log')
var windows = require('./windows')
const config = require('../config')
const log = require('./log')
const windows = require('./windows')
var AUTO_UPDATE_URL = config.AUTO_UPDATE_URL +
const AUTO_UPDATE_URL = config.AUTO_UPDATE_URL +
'?version=' + config.APP_VERSION +
'&platform=' + process.platform

View File

@@ -2,9 +2,9 @@ module.exports = {
init
}
var electron = require('electron')
const electron = require('electron')
var app = electron.app
const app = electron.app
/**
* Add a user task menu to the app icon on right-click. (Windows)

View File

@@ -1,17 +1,17 @@
var about = module.exports = {
const about = module.exports = {
init,
win: null
}
var config = require('../../config')
var electron = require('electron')
const config = require('../../config')
const electron = require('electron')
function init () {
if (about.win) {
return about.win.show()
}
var win = about.win = new electron.BrowserWindow({
const win = about.win = new electron.BrowserWindow({
backgroundColor: '#ECECEC',
center: true,
fullscreen: false,

View File

@@ -1,4 +1,4 @@
var main = module.exports = {
const main = module.exports = {
dispatch,
hide,
init,
@@ -14,23 +14,23 @@ var main = module.exports = {
win: null
}
var electron = require('electron')
const electron = require('electron')
var app = electron.app
const app = electron.app
var config = require('../../config')
var log = require('../log')
var menu = require('../menu')
var tray = require('../tray')
const config = require('../../config')
const log = require('../log')
const menu = require('../menu')
const tray = require('../tray')
var HEADER_HEIGHT = 38
var TORRENT_HEIGHT = 100
const HEADER_HEIGHT = 38
const TORRENT_HEIGHT = 100
function init () {
if (main.win) {
return main.win.show()
}
var win = main.win = new electron.BrowserWindow({
const win = main.win = new electron.BrowserWindow({
backgroundColor: '#282828',
darkTheme: true, // Forces dark theme (GTK+3)
icon: getIconPath(), // Window icon (Windows, Linux)
@@ -114,7 +114,7 @@ function setBounds (bounds, maximize) {
}
// Maximize or minimize, if the second argument is present
var willBeMaximized
let willBeMaximized
if (maximize === true) {
if (!main.win.isMaximized()) {
log('setBounds: maximizing')
@@ -136,7 +136,7 @@ function setBounds (bounds, maximize) {
log('setBounds: setting bounds to ' + JSON.stringify(bounds))
if (bounds.x === null && bounds.y === null) {
// X and Y not specified? By default, center on current screen
var scr = electron.screen.getDisplayMatching(main.win.getBounds())
const scr = electron.screen.getDisplayMatching(main.win.getBounds())
bounds.x = Math.round(scr.bounds.x + scr.bounds.width / 2 - bounds.width / 2)
bounds.y = Math.round(scr.bounds.y + scr.bounds.height / 2 - bounds.height / 2)
log('setBounds: centered to ' + JSON.stringify(bounds))

View File

@@ -1,4 +1,4 @@
var webtorrent = module.exports = {
const webtorrent = module.exports = {
init,
send,
show,
@@ -6,13 +6,13 @@ var webtorrent = module.exports = {
win: null
}
var electron = require('electron')
const electron = require('electron')
var config = require('../../config')
var log = require('../log')
const config = require('../../config')
const log = require('../log')
function init () {
var win = webtorrent.win = new electron.BrowserWindow({
const win = webtorrent.win = new electron.BrowserWindow({
backgroundColor: '#1E1E1E',
center: true,
fullscreen: false,