Issue #92: Merge with master & exclude some of the proposed changes.

src/main/announcement.js

@@ -7,9 +7,8 @@ const electron = require('electron')
 const config = require('../config')
 const log = require('./log')
 
-const ANNOUNCEMENT_URL = config.ANNOUNCEMENT_URL +
-  '?version=' + config.APP_VERSION +
-  '&platform=' + process.platform
+const ANNOUNCEMENT_URL =
+  `${config.ANNOUNCEMENT_URL}?version=${config.APP_VERSION}&platform=${process.platform}`
 
 /**
  * In certain situations, the WebTorrent team may need to show an announcement to

src/main/external-player.js

@@ -29,7 +29,6 @@ function spawn (playerPath, url, title) {
     if (err) return windows.main.dispatch('externalPlayerNotFound')
     const args = [
       '--play-and-exit',
-      '--video-on-top',
       '--quiet',
       `--meta-title=${JSON.stringify(title)}`,
       url
@@ -40,13 +39,13 @@ function spawn (playerPath, url, title) {
 
 function kill () {
   if (!proc) return
-  log('Killing external player, pid ' + proc.pid)
+  log(`Killing external player, pid ${proc.pid}`)
   proc.kill('SIGKILL') // kill -9
   proc = null
 }
 
 function spawnExternal (playerPath, args) {
-  log('Running external media player:', playerPath + ' ' + args.join(' '))
+  log('Running external media player:', `${playerPath} ${args.join(' ')}`)
 
   if (process.platform === 'darwin' && path.extname(playerPath) === '.app') {
     // Mac: Use executable in packaged .app bundle

src/main/handlers.js

@@ -40,9 +40,9 @@ function installDarwin () {
   // File handlers are defined in `Info.plist`.
 }
 
-function uninstallDarwin () { }
+function uninstallDarwin () {}
 
-const EXEC_COMMAND = [process.execPath]
+const EXEC_COMMAND = [ process.execPath, '--' ]
 
 if (!config.IS_PRODUCTION) {
   EXEC_COMMAND.push(config.ROOT_PATH)
@@ -312,7 +312,7 @@ function installLinux () {
       'webtorrent-desktop.desktop'
     )
     fs.mkdirp(path.dirname(desktopFilePath))
-    fs.writeFile(desktopFilePath, desktopFile, (err) => {
+    fs.writeFile(desktopFilePath, desktopFile, err => {
       if (err) return log.error(err.message)
     })
   }
@@ -334,9 +334,9 @@ function installLinux () {
       'icons',
       'webtorrent-desktop.png'
     )
-    mkdirp(path.dirname(iconFilePath), (err) => {
+    mkdirp(path.dirname(iconFilePath), err => {
       if (err) return log.error(err.message)
-      fs.writeFile(iconFilePath, iconFile, (err) => {
+      fs.writeFile(iconFilePath, iconFile, err => {
         if (err) log.error(err.message)
       })
     })

src/main/index.js

@@ -188,7 +188,7 @@ function onAppOpen (newArgv) {
 function sliceArgv (argv) {
   return argv.slice(config.IS_PRODUCTION ? 1
     : config.IS_TEST ? 4
-    : 2)
+      : 2)
 }
 
 function processArgv (argv) {

src/main/windows/main.js

@@ -138,7 +138,7 @@ function setAspectRatio (aspectRatio) {
 function setBounds (bounds, maximize) {
   // Do nothing in fullscreen
   if (!main.win || main.win.isFullScreen()) {
-    log('setBounds: not setting bounds because we\'re in full screen')
+    log(`setBounds: not setting bounds because we're in full screen`)
     return
   }
 
@@ -162,13 +162,13 @@ function setBounds (bounds, maximize) {
 
   // Assuming we're not maximized or maximizing, set the window size
   if (!willBeMaximized) {
-    log('setBounds: setting bounds to ' + JSON.stringify(bounds))
+    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
       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))
+      log(`setBounds: centered to ${JSON.stringify(bounds)}`)
     }
     // Resize the window's content area (so window border doesn't need to be taken
     // into account)