update main process files to es6

codebytere · codebytere · commit 6fdf86332008 · 2018-02-15T19:25:44.000-05:00
diff --git a/main-process/communication/async-msg.js b/main-process/communication/async-msg.js
@@ -1,5 +1,5 @@
-const ipc = require('electron').ipcMain
+const {ipcMain} = require('electron')
 
-ipc.on('asynchronous-message', function (event, arg) {
+ipcMain.on('asynchronous-message', (event, arg) => {
   event.sender.send('asynchronous-reply', 'pong')
 })
diff --git a/main-process/communication/sync-msg.js b/main-process/communication/sync-msg.js
@@ -1,5 +1,5 @@
-const ipc = require('electron').ipcMain
+const {ipcMain} = require('electron')
 
-ipc.on('synchronous-message', function (event, arg) {
+ipcMain.on('synchronous-message', (event, arg) => {
   event.returnValue = 'pong'
 })
diff --git a/main-process/media/pdf.js b/main-process/media/pdf.js
@@ -1,22 +1,17 @@
 const fs = require('fs')
 const os = require('os')
 const path = require('path')
-const electron = require('electron')
-const BrowserWindow = electron.BrowserWindow
-const ipc = electron.ipcMain
-const shell = electron.shell
+const {BrowserWindow, ipcMain, shell} = require('electron')
 
-ipc.on('print-to-pdf', function (event) {
+ipcMain.on('print-to-pdf', (event) => {
   const pdfPath = path.join(os.tmpdir(), 'print.pdf')
   const win = BrowserWindow.fromWebContents(event.sender)
   // Use default printing options
-  win.webContents.printToPDF({}, function (error, data) {
+  win.webContents.printToPDF({}, (error, data) => {
     if (error) throw error
-    fs.writeFile(pdfPath, data, function (error) {
-      if (error) {
-        throw error
-      }
-      shell.openExternal('file://' + pdfPath)
+    fs.writeFile(pdfPath, data, (error) => {
+      if (error) throw error
+      shell.openExternal(`file://${pdfPath}`)
       event.sender.send('wrote-pdf', pdfPath)
     })
   })
diff --git a/main-process/menus/application-menu.js b/main-process/menus/application-menu.js
@@ -1,7 +1,4 @@
-const electron = require('electron')
-const BrowserWindow = electron.BrowserWindow
-const Menu = electron.Menu
-const app = electron.app
+const {BrowserWindow, Menu, app, shell, dialog} = require('electron')
 
 let template = [{
   label: 'Edit',
@@ -37,44 +34,42 @@ let template = [{
   submenu: [{
     label: 'Reload',
     accelerator: 'CmdOrCtrl+R',
-    click: function (item, focusedWindow) {
+    click: (item, focusedWindow) => {
       if (focusedWindow) {
         // on reload, start fresh and close any old
         // open secondary windows
         if (focusedWindow.id === 1) {
-          BrowserWindow.getAllWindows().forEach(function (win) {
-            if (win.id > 1) {
-              win.close()
-            }
+          BrowserWindow.getAllWindows().forEach(win => {
+            if (win.id > 1) win.close()
           })
         }
         focusedWindow.reload()
       }
     }
   }, {
     label: 'Toggle Full Screen',
-    accelerator: (function () {
+    accelerator: (() => {
       if (process.platform === 'darwin') {
         return 'Ctrl+Command+F'
       } else {
         return 'F11'
       }
     })(),
-    click: function (item, focusedWindow) {
+    click: (item, focusedWindow) => {
       if (focusedWindow) {
         focusedWindow.setFullScreen(!focusedWindow.isFullScreen())
       }
     }
   }, {
     label: 'Toggle Developer Tools',
-    accelerator: (function () {
+    accelerator: (() => {
       if (process.platform === 'darwin') {
         return 'Alt+Command+I'
       } else {
         return 'Ctrl+Shift+I'
       }
     })(),
-    click: function (item, focusedWindow) {
+    click: (item, focusedWindow) => {
       if (focusedWindow) {
         focusedWindow.toggleDevTools()
       }
@@ -91,7 +86,7 @@ let template = [{
           buttons: ['Ok'],
           message: 'This demo is for the Menu section, showing how to create a clickable menu item in the application menu.'
         }
-        electron.dialog.showMessageBox(focusedWindow, options, function () {})
+        dialog.showMessageBox(focusedWindow, options, function () {})
       }
     }
   }]
@@ -113,7 +108,7 @@ let template = [{
     accelerator: 'CmdOrCtrl+Shift+T',
     enabled: false,
     key: 'reopenMenuItem',
-    click: function () {
+    click: () => {
       app.emit('activate')
     }
   }]
@@ -122,16 +117,16 @@ let template = [{
   role: 'help',
   submenu: [{
     label: 'Learn More',
-    click: function () {
-      electron.shell.openExternal('http://electron.atom.io')
+    click: () => {
+      shell.openExternal('http://electron.atom.io')
     }
   }]
 }]
 
 function addUpdateMenuItems (items, position) {
   if (process.mas) return
 
-  const version = electron.app.getVersion()
+  const version = app.getVersion()
   let updateItems = [{
     label: `Version ${version}`,
     enabled: false
@@ -143,15 +138,15 @@ function addUpdateMenuItems (items, position) {
     label: 'Check for Update',
     visible: false,
     key: 'checkForUpdate',
-    click: function () {
+    click: () => {
       require('electron').autoUpdater.checkForUpdates()
     }
   }, {
     label: 'Restart and Install Update',
     enabled: true,
     visible: false,
     key: 'restartToUpdate',
-    click: function () {
+    click: () => {
       require('electron').autoUpdater.quitAndInstall()
     }
   }]
@@ -164,9 +159,9 @@ function findReopenMenuItem () {
   if (!menu) return
 
   let reopenMenuItem
-  menu.items.forEach(function (item) {
+  menu.items.forEach(item => {
     if (item.submenu) {
-      item.submenu.items.forEach(function (item) {
+      item.submenu.items.forEach(item => {
         if (item.key === 'reopenMenuItem') {
           reopenMenuItem = item
         }
@@ -177,7 +172,7 @@ function findReopenMenuItem () {
 }
 
 if (process.platform === 'darwin') {
-  const name = electron.app.getName()
+  const name = app.getName()
   template.unshift({
     label: name,
     submenu: [{
@@ -207,7 +202,7 @@ if (process.platform === 'darwin') {
     }, {
       label: 'Quit',
       accelerator: 'Command+Q',
-      click: function () {
+      click: () => {
         app.quit()
       }
     }]
@@ -229,17 +224,17 @@ if (process.platform === 'win32') {
   addUpdateMenuItems(helpMenu, 0)
 }
 
-app.on('ready', function () {
+app.on('ready', () => {
   const menu = Menu.buildFromTemplate(template)
   Menu.setApplicationMenu(menu)
 })
 
-app.on('browser-window-created', function () {
+app.on('browser-window-created', () => {
   let reopenMenuItem = findReopenMenuItem()
   if (reopenMenuItem) reopenMenuItem.enabled = false
 })
 
-app.on('window-all-closed', function () {
+app.on('window-all-closed', () => {
   let reopenMenuItem = findReopenMenuItem()
   if (reopenMenuItem) reopenMenuItem.enabled = true
 })
diff --git a/main-process/menus/context-menu.js b/main-process/menus/context-menu.js
@@ -1,22 +1,23 @@
-const electron = require('electron')
-const BrowserWindow = electron.BrowserWindow
-const Menu = electron.Menu
-const MenuItem = electron.MenuItem
-const ipc = electron.ipcMain
-const app = electron.app
+const {
+  BrowserWindow,
+  Menu,
+  MenuItem,
+  ipcMain,
+  app
+} = require('electron')
 
 const menu = new Menu()
 menu.append(new MenuItem({ label: 'Hello' }))
 menu.append(new MenuItem({ type: 'separator' }))
 menu.append(new MenuItem({ label: 'Electron', type: 'checkbox', checked: true }))
 
-app.on('browser-window-created', function (event, win) {
-  win.webContents.on('context-menu', function (e, params) {
+app.on('browser-window-created', (event, win) => {
+  win.webContents.on('context-menu', (e, params) => {
     menu.popup(win, params.x, params.y)
   })
 })
 
-ipc.on('show-context-menu', function (event) {
+ipcMain.on('show-context-menu', (event) => {
   const win = BrowserWindow.fromWebContents(event.sender)
   menu.popup(win)
 })
