mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Make config optional

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-02 14:29:59 -08:00
parent ce12dcd3b4
commit eb03ab561d
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/browser/api/touch-bar.js
View file

@ -90,7 +90,7 @@ class TouchBar extends EventEmitter {
} }
class TouchBarItem extends EventEmitter { class TouchBarItem extends EventEmitter {
constructor (config) { constructor () {
super() super()
this.id = `${nextItemID++}` this.id = `${nextItemID++}`
} }
@ -113,7 +113,8 @@ class TouchBarItem extends EventEmitter {
TouchBar.Button = class TouchBarButton extends TouchBarItem { TouchBar.Button = class TouchBarButton extends TouchBarItem {
constructor (config) { constructor (config) {
super(config) super()
if (config == null) config = {}
this.type = 'button' this.type = 'button'
const {click, icon, label, backgroundColor} = config const {click, icon, label, backgroundColor} = config
this._addLiveProperty('label', label) this._addLiveProperty('label', label)
@ -127,7 +128,8 @@ TouchBar.Button = class TouchBarButton extends TouchBarItem {
TouchBar.ColorPicker = class TouchBarColorPicker extends TouchBarItem { TouchBar.ColorPicker = class TouchBarColorPicker extends TouchBarItem {
constructor (config) { constructor (config) {
super(config) super()
if (config == null) config = {}
this.type = 'colorpicker' this.type = 'colorpicker'
const {availableColors, change, selectedColor} = config const {availableColors, change, selectedColor} = config
this._addLiveProperty('availableColors', availableColors) this._addLiveProperty('availableColors', availableColors)
@ -144,7 +146,8 @@ TouchBar.ColorPicker = class TouchBarColorPicker extends TouchBarItem {
TouchBar.Group = class TouchBarGroup extends TouchBarItem { TouchBar.Group = class TouchBarGroup extends TouchBarItem {
constructor (config) { constructor (config) {
super(config) super()
if (config == null) config = {}
this.type = 'group' this.type = 'group'
this.child = config.items this.child = config.items
if (!(this.child instanceof TouchBar)) { if (!(this.child instanceof TouchBar)) {
@ -155,7 +158,8 @@ TouchBar.Group = class TouchBarGroup extends TouchBarItem {
TouchBar.Label = class TouchBarLabel extends TouchBarItem { TouchBar.Label = class TouchBarLabel extends TouchBarItem {
constructor (config) { constructor (config) {
super(config) super()
if (config == null) config = {}
this.type = 'label' this.type = 'label'
this._addLiveProperty('label', config.label) this._addLiveProperty('label', config.label)
} }
@ -163,7 +167,8 @@ TouchBar.Label = class TouchBarLabel extends TouchBarItem {
TouchBar.Spacer = class TouchBarSpacer extends TouchBarItem { TouchBar.Spacer = class TouchBarSpacer extends TouchBarItem {
constructor (config) { constructor (config) {
super(config) super()
if (config == null) config = {}
this.type = 'spacer' this.type = 'spacer'
this._addLiveProperty('size', config.size) this._addLiveProperty('size', config.size)
} }
@ -171,7 +176,8 @@ TouchBar.Spacer = class TouchBarSpacer extends TouchBarItem {
TouchBar.Popover = class TouchBarPopover extends TouchBarItem { TouchBar.Popover = class TouchBarPopover extends TouchBarItem {
constructor (config) { constructor (config) {
super(config) super()
if (config == null) config = {}
this.type = 'popover' this.type = 'popover'
this._addLiveProperty('label', config.label) this._addLiveProperty('label', config.label)
this._addLiveProperty('icon', config.icon) this._addLiveProperty('icon', config.icon)
@ -185,7 +191,8 @@ TouchBar.Popover = class TouchBarPopover extends TouchBarItem {
TouchBar.Slider = class TouchBarSlider extends TouchBarItem { TouchBar.Slider = class TouchBarSlider extends TouchBarItem {
constructor (config) { constructor (config) {
super(config) super()
if (config == null) config = {}
this.type = 'slider' this.type = 'slider'
const {change, label, minValue, maxValue, value} = config const {change, label, minValue, maxValue, value} = config
this._addLiveProperty('label', label) this._addLiveProperty('label', label)