Merge branch 'master' into update-electron

# Conflicts:
#	package-lock.json
#	package.json

src/main/dialog.js

@@ -19,7 +19,7 @@ function openSeedFile () {
   log('openSeedFile')
   const opts = {
     title: 'Select a file for the torrent.',
-    properties: [ 'openFile' ]
+    properties: ['openFile']
   }
   showOpenSeed(opts)
 }
@@ -35,11 +35,11 @@ function openSeedDirectory () {
   const opts = process.platform === 'darwin'
     ? {
       title: 'Select a file or folder for the torrent.',
-      properties: [ 'openFile', 'openDirectory' ]
+      properties: ['openFile', 'openDirectory']
     }
     : {
       title: 'Select a folder for the torrent.',
-      properties: [ 'openDirectory' ]
+      properties: ['openDirectory']
     }
   showOpenSeed(opts)
 }
@@ -54,11 +54,11 @@ function openFiles () {
   const opts = process.platform === 'darwin'
     ? {
       title: 'Select a file or folder to add.',
-      properties: [ 'openFile', 'openDirectory' ]
+      properties: ['openFile', 'openDirectory']
     }
     : {
       title: 'Select a file to add.',
-      properties: [ 'openFile' ]
+      properties: ['openFile']
     }
   setTitle(opts.title)
   electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
@@ -77,7 +77,7 @@ function openTorrentFile () {
   const opts = {
     title: 'Select a .torrent file.',
     filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
-    properties: [ 'openFile', 'multiSelections' ]
+    properties: ['openFile', 'multiSelections']
   }
   setTitle(opts.title)
   electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {

src/main/handlers.js

@@ -42,7 +42,7 @@ function installDarwin () {
 
 function uninstallDarwin () {}
 
-const EXEC_COMMAND = [ process.execPath, '--' ]
+const EXEC_COMMAND = [process.execPath, '--']
 
 if (!config.IS_PRODUCTION) {
   EXEC_COMMAND.push(config.ROOT_PATH)

src/main/index.js

@@ -167,7 +167,7 @@ function onOpen (e, torrentId) {
     // Electron issue: https://github.com/atom/electron/issues/4338
     setTimeout(() => windows.main.show(), 100)
 
-    processArgv([ torrentId ])
+    processArgv([torrentId])
   } else {
     argv.push(torrentId)
   }

src/main/thumbar.js

@@ -77,8 +77,8 @@ function onPlayerPlay () {
 
 function onPlayerUpdate (state) {
   if (!isEnabled()) return
-  buttons[PREV].flags = [ state.hasPrevious ? 'enabled' : 'disabled' ]
-  buttons[NEXT].flags = [ state.hasNext ? 'enabled' : 'disabled' ]
+  buttons[PREV].flags = [state.hasPrevious ? 'enabled' : 'disabled']
+  buttons[NEXT].flags = [state.hasNext ? 'enabled' : 'disabled']
   update()
 }