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

Check that escape item is non-null before checking id

Browse source
This commit is contained in:
Kevin Sawicki 2017-04-04 13:12:29 -07:00
parent 414540bfcb
commit bbadeb62ac
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,7 +101,7 @@ class TouchBar extends EventEmitter {
const interactionListener = (event, itemID, details) => { const interactionListener = (event, itemID, details) => {
let item = this.items[itemID] let item = this.items[itemID]
if (item == null && this.escapeItem.id === itemID) { if (item == null && this.escapeItem != null && this.escapeItem.id === itemID) {
item = this.escapeItem item = this.escapeItem
} }
if (item != null && item.onInteraction != null) { if (item != null && item.onInteraction != null) {

12
spec/api-touch-bar-spec.js
View file

@ -78,5 +78,17 @@ describe('TouchBar module', function () {
window.setTouchBar(new TouchBar([new TouchBarLabel({label: 'two'})])) window.setTouchBar(new TouchBar([new TouchBarLabel({label: 'two'})]))
touchBar.escapeItem = null touchBar.escapeItem = null
}) })
it('calls the callback on the items when a window interaction event fires', function (done) {
const button = new TouchBarButton({
label: 'bar',
click: () => {
done()
}
})
const touchBar = new TouchBar({items: [button]})
window.setTouchBar(touchBar)
window.emit('-touch-bar-interaction', {}, button.id)
})
}) })
}) })