Merge pull request electron#166 from electron/letsconst4

zeke · zeke · commit d38fdcf77b75 · 2016-04-26T09:42:20.000-07:00
Let/Const/StringTemplates in section and tests
diff --git a/main-process/system/protocol-handler.js b/main-process/system/protocol-handler.js
@@ -4,5 +4,5 @@ const dialog = require('electron').dialog
 app.setAsDefaultProtocolClient('electron-api-demos')
 
 app.on('open-url', function (event, url) {
-  dialog.showErrorBox('Welcome Back', `You arrived from: ${url}` )
+  dialog.showErrorBox('Welcome Back', `You arrived from: ${url}`)
 })
diff --git a/package.json b/package.json
@@ -52,5 +52,10 @@
     "electron-json-storage": "^2.0.0",
     "glob": "^6.0.4",
     "highlight.js": "^9.3.0"
+  },
+  "standard": {
+    "env": {
+      "mocha": true
+    }
   }
 }
diff --git a/sections/communication/invisible.html b/sections/communication/invisible.html
@@ -1,18 +1,18 @@
 <html>
   <script type="text/javascript">
-    var ipc = require('electron').ipcRenderer;
-    var BrowserWindow = require('electron').remote.BrowserWindow;
+    const ipc = require('electron').ipcRenderer
+    const BrowserWindow = require('electron').remote.BrowserWindow
 
     ipc.on('compute-factorial', function (event, number, fromWindowId) {
-      var result = factorial(number);
-      var fromWindow = BrowserWindow.fromId(fromWindowId);
-      fromWindow.webContents.send('factorial-computed', number, result);
-      window.close();
-    });
+      const result = factorial(number)
+      const fromWindow = BrowserWindow.fromId(fromWindowId)
+      fromWindow.webContents.send('factorial-computed', number, result)
+      window.close()
+    })
 
     function factorial (num) {
-      if (num === 0) return 1;
-      return num * factorial(num - 1);
+      if (num === 0) return 1
+      return num * factorial(num - 1)
     }
   </script>
 </html>
diff --git a/sections/native-ui/dialogs.html b/sections/native-ui/dialogs.html
@@ -34,13 +34,13 @@ <h5>Main Process</h5>
             <h2>ProTip</h2>
             <strong>The sheet-style dialog on OS X.</strong>
             <p>On OS X you can choose between a "sheet" dialog or a default dialog. The sheet version descends from the top of the window. To use sheet version, pass the <code>window</code> as the first argument in the dialog method.</p>
-            <pre><code class="language-js">var ipc = require('electron').ipcMain
-var dialog = require('dialog')
-var BrowserWindow = require('browser-window')
+            <pre><code class="language-js">const ipc = require('electron').ipcMain
+const dialog = require('dialog')
+const BrowserWindow = require('browser-window')
 
 ipc.on('open-file-dialog-sheet', function (event) {
-  var window = BrowserWindow.fromWebContents(event.sender)
-  var files = dialog.showOpenDialog(window, { properties: [ 'openFile' ]})
+  const window = BrowserWindow.fromWebContents(event.sender)
+  const files = dialog.showOpenDialog(window, { properties: [ 'openFile' ]})
 })</code></pre>
           </div>
         </div>
diff --git a/tests/index.js b/tests/index.js
@@ -1,25 +1,22 @@
-var Application = require('spectron').Application
-var chai = require('chai')
-var chaiAsPromised = require('chai-as-promised')
-var path = require('path')
-var fs = require('fs')
+'use strict'
+
+const Application = require('spectron').Application
+const chai = require('chai')
+const chaiAsPromised = require('chai-as-promised')
+const path = require('path')
+const fs = require('fs')
 
 chai.should()
 chai.use(chaiAsPromised)
 
-var after = global.after
-var before = global.before
-var describe = global.describe
-var it = global.it
-
 describe('demo app', function () {
   this.timeout(30000)
 
-  var app
+  let app
 
-  var removeStoredPreferences = function () {
-    var productName = require('../package').productName
-    var userDataPath = path.join(process.env.HOME, 'Library', 'Application Support', productName)
+  const removeStoredPreferences = function () {
+    const productName = require('../package').productName
+    const userDataPath = path.join(process.env.HOME, 'Library', 'Application Support', productName)
     try {
       fs.unlinkSync(path.join(userDataPath, 'activeDemoButtonId.json'))
     } catch (error) {
@@ -32,7 +29,7 @@ describe('demo app', function () {
     }
   }
 
-  var startApp = function () {
+  const startApp = function () {
     app = new Application({
       path: path.join(__dirname, '..', 'node_modules', '.bin', 'electron'),
       args: [
@@ -48,7 +45,7 @@ describe('demo app', function () {
     })
   }
 
-  var restartApp = function () {
+  const restartApp = function () {
     return app.stop().then(function () {
       return startApp()
     })
@@ -98,7 +95,7 @@ describe('demo app', function () {
 
   describe('when a demo title is clicked', function () {
     it('it expands the demo content', function () {
-      var onlyFirstVisible = Array(21).fill(false)
+      let onlyFirstVisible = Array(26).fill(false)
       onlyFirstVisible[0] = true
 
       return app.client.click('button[data-section="windows"]')
@@ -111,7 +108,7 @@ describe('demo app', function () {
 
   describe('when the app is restarted after use', function () {
     it('it launches at last visted section & demo', function () {
-      var onlyFirstVisible = Array(21).fill(false)
+      let onlyFirstVisible = Array(26).fill(false)
       onlyFirstVisible[0] = true
 
       return app.client.waitForVisible('#windows-section')

Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,10 @@`
`52`	`52`	`"electron-json-storage": "^2.0.0",`
`53`	`53`	`"glob": "^6.0.4",`
`54`	`54`	`"highlight.js": "^9.3.0"`
	`55`	`+ },`
	`56`	`+ "standard": {`
	`57`	`+ "env": {`
	`58`	`+ "mocha": true`
	`59`	`+ }`
`55`	`60`	`}`
`56`	`61`	`}`