Merge pull request electron#118 from electron/lint

Lint using standard

Author: zeke

main.js

@@ -9,7 +9,7 @@ electron.hideInternalModules()
 process.throwDeprecation = true
 
 // Require and setup each JS file in the main-process dir
-glob(__dirname + '/main-process/**/*.js', function (error, files) {
+glob(path.join(__dirname, 'main-process/**/*.js'), function (error, files) {
   if (error) return console.log(error)
   files.forEach(function (file) {
     require(file)
@@ -19,7 +19,7 @@ glob(__dirname + '/main-process/**/*.js', function (error, files) {
 function createWindow () {
   var iconPath = path.join(__dirname, '/assets/app-icon/png/512.png')
   mainWindow = new BrowserWindow({ width: 1080, minWidth: 680, height: 800, icon: iconPath })
-  mainWindow.loadURL('file://' + __dirname + '/index.html')
+  mainWindow.loadURL('file://' + path.join(__dirname, 'index.html'))
   mainWindow.on('closed', function () {
     mainWindow = null
   })

package.json

@@ -6,7 +6,7 @@
   "main": "main.js",
   "scripts": {
     "start": "electron .",
-    "lint": "standard-format --write",
+    "lint": "standard",
     "test": "mocha tests && npm run lint",
     "sign-win": "signcode -spc ~/electron-api-demos.spc -v ~/electron-api-demos.pvk -a sha1 -$ commercial -n 'Electron API Demos' -i http://electron.atom.io  -t http://timestamp.verisign.com/scripts/timstamp.dll -tr 10 './out/Electron API Demos-win32-ia32/Electron API Demos.exe'",
     "pack-mac": "electron-packager . 'Electron API Demos' --overwrite --platform=darwin --arch=x64 --icon=assets/app-icon/mac/app.icns --prune=true --out=out --sign='Developer ID Application: GitHub'",
@@ -43,7 +43,7 @@
     "mocha": "^2.3.4",
     "request": "^2.70.0",
     "spectron": "~1.37.0",
-    "standard-format": "^2.1.1"
+    "standard": "^6.0.8"
   },
   "dependencies": {
     "electron-json-storage": "^2.0.0",

renderer-process/communication/invisible-msg.js

@@ -1,12 +1,13 @@
 var BrowserWindow = require('electron').remote.BrowserWindow
 var ipcRenderer = require('electron').ipcRenderer
+var path = require('path')
 
 var invisMsgBtn = document.getElementById('invis-msg')
 var invisReply = document.getElementById('invis-reply')
 
 invisMsgBtn.addEventListener('click', function (clickEvent) {
   var windowID = BrowserWindow.getFocusedWindow().id
-  var invisPath = 'file://' + __dirname + '/sections/communication/invisible.html'
+  var invisPath = 'file://' + path.join(__dirname, 'sections/communication/invisible.html')
   var win = new BrowserWindow({ width: 400, height: 400, show: false })
   win.loadURL(invisPath)
 

renderer-process/windows/create-window.js

@@ -1,8 +1,10 @@
 var BrowserWindow = require('electron').remote.BrowserWindow
+var path = require('path')
+
 var newWindowBtn = document.getElementById('new-window')
 
 newWindowBtn.addEventListener('click', function (event) {
-  var modalPath = 'file://' + __dirname + '/sections/windows/modal.html'
+  var modalPath = 'file://' + path.join(__dirname, 'sections/windows/modal.html')
   var win = new BrowserWindow({ width: 400, height: 320 })
   win.on('closed', function () { win = null })
   win.loadURL(modalPath)

renderer-process/windows/manage-window.js

@@ -1,8 +1,10 @@
 var BrowserWindow = require('electron').remote.BrowserWindow
+var path = require('path')
+
 var manageWindowBtn = document.getElementById('manage-window')
 
 manageWindowBtn.addEventListener('click', function (event) {
-  var modalPath = 'file://' + __dirname + '/sections/windows/manage-modal.html'
+  var modalPath = 'file://' + path.join(__dirname, 'sections/windows/manage-modal.html')
   var win = new BrowserWindow({ width: 400, height: 225 })
 
   win.on('resize', updateReply)

script/release renamed to script/release.js

@@ -54,12 +54,10 @@ function zipAssets () {
   const assets = [{
     name: 'electron-api-demos-mac.zip',
     path: path.join(__dirname, '..', 'out', 'Electron API Demos-darwin-x64', 'Electron API Demos.app')
-  },
-  {
+  }, {
     name: 'electron-api-demos-windows.zip',
     path: path.join(__dirname, '..', 'out', 'Electron API Demos-win32-ia32')
-  },
-  {
+  }, {
     name: 'electron-api-demos-linux.zip',
     path: path.join(__dirname, '..', 'out', 'Electron API Demos-linux-x64')
   }]