Merge pull request electron#164 from electron/letsconst

zeke · zeke · commit 52d44f98f309 · 2016-04-25T15:34:15.000-07:00
Let/Const/StringTemplates in main-process
diff --git a/main-process/communication/async-msg.js b/main-process/communication/async-msg.js
@@ -1,4 +1,4 @@
-var ipc = require('electron').ipcMain
+const ipc = require('electron').ipcMain
 
 ipc.on('asynchronous-message', function (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,4 +1,4 @@
-var ipc = require('electron').ipcMain
+const ipc = require('electron').ipcMain
 
 ipc.on('synchronous-message', function (event, arg) {
   event.returnValue = 'pong'
diff --git a/main-process/media/pdf.js b/main-process/media/pdf.js
@@ -7,8 +7,8 @@ const ipc = electron.ipcMain
 const shell = electron.shell
 
 ipc.on('print-to-pdf', function (event) {
-  var pdfPath = path.join(os.tmpdir(), 'print.pdf')
-  var win = BrowserWindow.fromWebContents(event.sender)
+  const pdfPath = path.join(os.tmpdir(), 'print.pdf')
+  const win = BrowserWindow.fromWebContents(event.sender)
   // Use default printing options
   win.webContents.printToPDF({}, function (error, data) {
     if (error) throw error
diff --git a/main-process/menus/application-menu.js b/main-process/menus/application-menu.js
@@ -1,9 +1,9 @@
-var electron = require('electron')
-var BrowserWindow = electron.BrowserWindow
-var Menu = electron.Menu
-var app = electron.app
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
+const Menu = electron.Menu
+const app = electron.app
 
-var template = [{
+let template = [{
   label: 'Edit',
   submenu: [{
     label: 'Undo',
@@ -85,7 +85,7 @@ var template = [{
     label: 'App Menu Demo',
     click: function (item, focusedWindow) {
       if (focusedWindow) {
-        var options = {
+        const options = {
           type: 'info',
           title: 'Application Menu Demo',
           buttons: ['Ok'],
@@ -119,9 +119,9 @@ var template = [{
 }]
 
 function addUpdateMenuItems (items, position) {
-  var version = electron.app.getVersion()
-  var updateItems = [{
-    label: 'Version ' + version,
+  const version = electron.app.getVersion()
+  let updateItems = [{
+    label: `Version ${version}`,
     enabled: false
   }, {
     label: 'Checking for Update',
@@ -148,11 +148,11 @@ function addUpdateMenuItems (items, position) {
 }
 
 if (process.platform === 'darwin') {
-  var name = electron.app.getName()
+  const name = electron.app.getName()
   template.unshift({
     label: name,
     submenu: [{
-      label: 'About ' + name,
+      label: `About ${name}`,
       role: 'about'
     }, {
       type: 'separator'
@@ -163,7 +163,7 @@ if (process.platform === 'darwin') {
     }, {
       type: 'separator'
     }, {
-      label: 'Hide ' + name,
+      label: `Hide ${name}`,
       accelerator: 'Command+H',
       role: 'hide'
     }, {
@@ -195,9 +195,9 @@ if (process.platform === 'darwin') {
 }
 
 if (process.platform === 'win32') {
-  var helpMenu = template[template.length - 1].submenu
+  const helpMenu = template[template.length - 1].submenu
   addUpdateMenuItems(helpMenu, 0)
 }
 
-var menu = Menu.buildFromTemplate(template)
+const menu = Menu.buildFromTemplate(template)
 Menu.setApplicationMenu(menu)
diff --git a/main-process/native-ui/dialogs/error.js b/main-process/native-ui/dialogs/error.js
@@ -1,5 +1,5 @@
-var ipc = require('electron').ipcMain
-var dialog = require('electron').dialog
+const ipc = require('electron').ipcMain
+const dialog = require('electron').dialog
 
 ipc.on('open-error-dialog', function (event) {
   dialog.showErrorBox('An Error Message', 'Demonstrating an error message.')
diff --git a/main-process/native-ui/dialogs/information.js b/main-process/native-ui/dialogs/information.js
@@ -1,8 +1,8 @@
-var ipc = require('electron').ipcMain
-var dialog = require('electron').dialog
+const ipc = require('electron').ipcMain
+const dialog = require('electron').dialog
 
 ipc.on('open-information-dialog', function (event) {
-  var options = {
+  const options = {
     type: 'info',
     title: 'Information',
     message: "This is an information dialog. Isn't it nice?",
diff --git a/main-process/native-ui/dialogs/open-file.js b/main-process/native-ui/dialogs/open-file.js
@@ -1,5 +1,5 @@
-var ipc = require('electron').ipcMain
-var dialog = require('electron').dialog
+const ipc = require('electron').ipcMain
+const dialog = require('electron').dialog
 
 ipc.on('open-file-dialog', function (event) {
   dialog.showOpenDialog({
diff --git a/main-process/native-ui/dialogs/save.js b/main-process/native-ui/dialogs/save.js
@@ -1,8 +1,8 @@
-var ipc = require('electron').ipcMain
-var dialog = require('electron').dialog
+const ipc = require('electron').ipcMain
+const dialog = require('electron').dialog
 
 ipc.on('save-dialog', function (event) {
-  var options = {
+  const options = {
     title: 'Save an Image',
     filters: [
       { name: 'Images', extensions: ['jpg', 'png', 'gif'] }
diff --git a/main-process/native-ui/tray/tray.js b/main-process/native-ui/tray/tray.js
@@ -1,12 +1,13 @@
 const path = require('path')
 const electron = require('electron')
 const ipc = electron.ipcMain
+
 let appIcon = null
 
 ipc.on('put-in-tray', function (event) {
-  var iconPath = path.join(__dirname, 'iconTemplate.png')
+  const iconPath = path.join(__dirname, 'iconTemplate.png')
   appIcon = new electron.Tray(iconPath)
-  var contextMenu = electron.Menu.buildFromTemplate([
+  const contextMenu = electron.Menu.buildFromTemplate([
     { label: 'Remove',
       click: function (menuItem, browserWindow) {
         event.sender.send('tray-removed')

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var ipc = require('electron').ipcMain`
	`1`	`+const ipc = require('electron').ipcMain`
`2`	`2`
`3`	`3`	`ipc.on('asynchronous-message', function (event, arg) {`
`4`	`4`	`event.sender.send('asynchronous-reply', 'pong')`