From 8d716e8b17e269f85c93b5b54ae5c4d69c6764d2 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 2 Mar 2017 09:30:21 -0800 Subject: [PATCH] Register item after validating --- lib/browser/api/touch-bar.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/browser/api/touch-bar.js b/lib/browser/api/touch-bar.js index 12138563c4ca..6871c82172a4 100644 --- a/lib/browser/api/touch-bar.js +++ b/lib/browser/api/touch-bar.js @@ -3,7 +3,6 @@ const {EventEmitter} = require('events') let nextItemID = 1 class TouchBar extends EventEmitter { - // Bind a touch bar to a window static _setOnWindow (touchBar, window) { if (window._touchBar != null) { @@ -31,6 +30,7 @@ class TouchBar extends EventEmitter { this.windowListeners = {} this.items = {} this.ordereredItems = [] + const registerItem = (item) => { this.items[item.id] = item item.on('change', () => { @@ -41,15 +41,14 @@ class TouchBar extends EventEmitter { } } items.forEach((item) => { - this.ordereredItems.push(item) if (!(item instanceof TouchBarItem)) { throw new Error('Each item must be an instance of a TouchBarItem') } + this.ordereredItems.push(item) registerItem(item) }) } - // Called by BrowserWindow.setTouchBar _addToWindow (window) { const {id} = window @@ -84,7 +83,6 @@ class TouchBar extends EventEmitter { window._setTouchBarItems(this.ordereredItems) } - // Called by BrowserWindow.setTouchBar _removeFromWindow (window) { const removeListeners = this.windowListeners[window.id] if (removeListeners != null) removeListeners()