Fix JS linting

diff --git a/default_app/default_app.js b/default_app/default_app.js
index 9ebc6b0ae948450284c5e87ecb28dab9a34288a7..57110e9c90d8e5b92366c0b940e48d68d4347526 100644 (file)
--- a/default_app/default_app.js
+++ b/default_app/default_app.js
@@ -1,4 +1,4 @@
-const {app, BrowserWindow,TouchBar} = require('electron')
+const {app, BrowserWindow, TouchBar} = require('electron')
 const path = require('path')
 
 let mainWindow = null
@@ -29,8 +29,8 @@ exports.load = (appUrl) => {
       new (TouchBar.Button)({
         label: 'Hello World!',
         // image: '/path/to/image',
-        backgroundColor: "FF0000",
-        labelColor: "0000FF",
+        backgroundColor: 'FF0000',
+        labelColor: '0000FF',
         click: () => {
           console.log('Hello World Clicked')
         }
@@ -68,7 +68,7 @@ exports.load = (appUrl) => {
         change: (newVal) => {
           console.log('Slider was changed', newVal, typeof newVal)
         }
-      }),
+      })
     ]))
   })
 }

diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
index ba1fdadcb62ac0d8c0178acc7790686e5192bcc6..ac6e3b4bb6ed723fdcc9c19703c1104af8bd60f2 100644 (file)
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const {ipcMain,TouchBar} = require('electron')
+const {ipcMain, TouchBar} = require('electron')
 const {EventEmitter} = require('events')
 const {BrowserWindow} = process.atomBinding('window')
 const v8Util = process.atomBinding('v8_util')
@@ -133,8 +133,8 @@ BrowserWindow.prototype._init = function () {
   })
 
   // Proxy TouchBar events
-  this.on('-touch-bar-interaction', (event, item_type, id, ...args) => {
-    TouchBar._event(item_type, id, ...args)
+  this.on('-touch-bar-interaction', (event, itemType, id, ...args) => {
+    TouchBar._event(itemType, id, ...args)
   })
 }
 
@@ -206,9 +206,9 @@ Object.assign(BrowserWindow.prototype, {
 // TouchBar API
 BrowserWindow.prototype.setTouchBar = function (touchBar) {
   if (touchBar === null || typeof touchBar === 'undefined') {
-    this._destroyTouchBar();
+    this._destroyTouchBar()
   } else if (Array.isArray(touchBar)) {
-    this._setTouchBar((new TouchBar(touchBar)).toJSON());
+    this._setTouchBar((new TouchBar(touchBar)).toJSON())
   } else {
     this._setTouchBar(touchBar.toJSON())
   }

diff --git a/lib/browser/api/touch-bar.js b/lib/browser/api/touch-bar.js
index 0479e19252ca1c91ab7ea167fc3962cf2d735b03..1b18656a697343a87af3335025175f0e73a9dccf 100644 (file)
--- a/lib/browser/api/touch-bar.js
+++ b/lib/browser/api/touch-bar.js
@@ -1,9 +1,6 @@
-const {EventEmitter} = require('events')
-const {app} = require('electron')
-
 class TouchBar {
   constructor (items) {
-    this.items = items;
+    this.items = items
     if (!Array.isArray(items)) {
       throw new Error('The items object provided has to be an array')
     }
@@ -15,33 +12,33 @@ class TouchBar {
   }
 
   toJSON () {
-    return this.items.map((item) => item.toJSON ? item.toJSON() : item);
+    return this.items.map((item) => item.toJSON ? item.toJSON() : item)
   }
 }
 
-let item_id_incrementor = 1
-const item_event_handlers = {}
+let itemIdIncrementor = 1
+const itemEventHandlers = {}
 
 TouchBar._event = (itemType, eventArgs) => {
   let args = eventArgs.slice(1)
   if (itemType === 'slider') {
     args = args.map(val => parseInt(val, 10))
   }
-  const id_parts = eventArgs[0].split('.')
-  const item_id = id_parts[id_parts.length - 1]
-  if (item_event_handlers[item_id]) item_event_handlers[item_id](...args)
+  const idParts = eventArgs[0].split('.')
+  const itemId = idParts[idParts.length - 1]
+  if (itemEventHandlers[itemId]) itemEventHandlers[itemId](...args)
 }
 
 class TouchBarItem {
   constructor (config) {
-    this.id = item_id_incrementor++
+    this.id = itemIdIncrementor++
     const mConfig = Object.assign({}, config || {})
     Object.defineProperty(this, 'config', {
       configurable: false,
       enumerable: false,
       get: () => mConfig
     })
-    this.config.id = `${this.config.id || this.id}`;
+    this.config.id = `${this.config.id || this.id}`
     if (typeof this.config !== 'object' || this.config === null) {
       throw new Error('Provided config must be a non-null object')
     }
@@ -58,7 +55,7 @@ TouchBar.Button = class TouchBarButton extends TouchBarItem {
     this.config.type = 'button'
     const click = config.click
     if (typeof click === 'function') {
-      item_event_handlers[`${this.id}`] = click
+      itemEventHandlers[`${this.id}`] = click
     }
   }
 }
@@ -69,7 +66,7 @@ TouchBar.ColorPicker = class TouchBarColorPicker extends TouchBarItem {
     this.config.type = 'colorpicker'
     const change = this.config.change
     if (typeof change === 'function') {
-      item_event_handlers[`${this.id}`] = change
+      itemEventHandlers[`${this.id}`] = change
     }
   }
 }
@@ -81,7 +78,7 @@ TouchBar.Group = class TouchBarGroup extends TouchBarItem {
   }
 
   toJSON () {
-    const config = this.config;
+    const config = this.config
     return Object.assign({}, config, {
       items: config.items && config.items.toJSON ? config.items.toJSON() : []
     })
@@ -102,7 +99,7 @@ TouchBar.PopOver = class TouchBarPopOver extends TouchBarItem {
   }
 
   toJSON () {
-    const config = this.config;
+    const config = this.config
     return Object.assign({}, config, {
       touchBar: config.touchBar && config.touchBar.toJSON ? config.touchBar.toJSON() : []
     })
@@ -112,12 +109,12 @@ TouchBar.PopOver = class TouchBarPopOver extends TouchBarItem {
 TouchBar.Slider = class TouchBarSlider extends TouchBarItem {
   constructor (config) {
     super(config)
-    this.config.type = 'slider';
+    this.config.type = 'slider'
     const change = this.config.change
     if (typeof change === 'function') {
-      item_event_handlers[this.id] = change
+      itemEventHandlers[this.id] = change
     }
   }
 }
 
-module.exports = TouchBar;
+module.exports = TouchBar