|
@@ -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
|