Browse Source

:art: Implement JS Standard Code Style 7

Updates Standard Code Style to 7 (latest major) and ensures that code
is conform.

 * camelCase is now enforced
 * No assignments in return statements
Felix Rieseberg 9 years ago
parent
commit
bef6748c06
4 changed files with 14 additions and 11 deletions
  1. 3 1
      lib/browser/api/menu-item.js
  2. 7 7
      lib/common/asar.js
  3. 3 2
      lib/renderer/override.js
  4. 1 1
      package.json

+ 3 - 1
lib/browser/api/menu-item.js

@@ -89,7 +89,9 @@ MenuItem = (function () {
     if (defaultValue == null) {
       defaultValue = null
     }
-    return this[name] != null ? this[name] : this[name] = defaultValue
+    this[name] != null ? this[name] : this[name] = defaultValue
+
+    return this[name]
   }
 
   MenuItem.prototype.overrideReadOnlyProperty = function (name, defaultValue) {

+ 7 - 7
lib/common/asar.js

@@ -1,6 +1,6 @@
 (function () {
   const asar = process.binding('atom_common_asar')
-  const child_process = require('child_process')
+  const childProcess = require('child_process')
   const path = require('path')
   const util = require('util')
 
@@ -591,13 +591,13 @@
     }
 
     // Executing a command string containing a path to an asar
-    // archive confuses `child_process.execFile`, which is internally
-    // called by `child_process.{exec,execSync}`, causing
+    // archive confuses `childProcess.execFile`, which is internally
+    // called by `childProcess.{exec,execSync}`, causing
     // Electron to consider the full command as a single path
     // to an archive.
     [ 'exec', 'execSync' ].forEach(function (functionName) {
-      var old = child_process[functionName]
-      child_process[functionName] = function () {
+      var old = childProcess[functionName]
+      childProcess[functionName] = function () {
         var processNoAsarOriginalValue = process.noAsar
         process.noAsar = true
         var result = old.apply(this, arguments)
@@ -607,10 +607,10 @@
     })
 
     overrideAPI(fs, 'open')
-    overrideAPI(child_process, 'execFile')
+    overrideAPI(childProcess, 'execFile')
     overrideAPISync(process, 'dlopen', 1)
     overrideAPISync(require('module')._extensions, '.node', 1)
     overrideAPISync(fs, 'openSync')
-    return overrideAPISync(child_process, 'execFileSync')
+    return overrideAPISync(childProcess, 'execFileSync')
   }
 })()

+ 3 - 2
lib/renderer/override.js

@@ -15,8 +15,9 @@ var BrowserWindowProxy = (function () {
   BrowserWindowProxy.proxies = {}
 
   BrowserWindowProxy.getOrCreate = function (guestId) {
-    var base
-    return (base = this.proxies)[guestId] != null ? base[guestId] : base[guestId] = new BrowserWindowProxy(guestId)
+    var base = this.proxies
+    base[guestId] != null ? base[guestId] : base[guestId] = new BrowserWindowProxy(guestId)
+    return base[guestId]
   }
 
   BrowserWindowProxy.remove = function (guestId) {

+ 1 - 1
package.json

@@ -4,7 +4,7 @@
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",
-    "standard": "^6.0.8"
+    "standard": "^7.1.0"
   },
   "optionalDependencies": {
     "runas": "^3.0.0"