From c91699712923a3b5a549f3f15d09923c5b1fce54 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Tue, 25 Oct 2022 12:21:22 +0400 Subject: [PATCH] Up device manager constructor --- src/device_manager/config/config.ts | 4 +++- src/device_manager/index.ts | 8 +------- src/device_manager/view/DevicesView.ts | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/device_manager/config/config.ts b/src/device_manager/config/config.ts index 891d321fe..37c242f8d 100644 --- a/src/device_manager/config/config.ts +++ b/src/device_manager/config/config.ts @@ -1,3 +1,5 @@ +import { DeviceProperties } from '../model/Device'; + export interface DeviceManagerConfig { /** * The device `id` to select on start, if not indicated, the first available from `devices` will be used. @@ -20,7 +22,7 @@ export interface DeviceManagerConfig { * ... * ] */ - devices?: Array; // TODO + devices?: DeviceProperties[]; } const config: DeviceManagerConfig = { diff --git a/src/device_manager/index.ts b/src/device_manager/index.ts index f5be3b686..ce1b8a5be 100644 --- a/src/device_manager/index.ts +++ b/src/device_manager/index.ts @@ -76,15 +76,9 @@ export default class DeviceManager extends ItemManagerModule< constructor(em: EditorModel) { super(em, 'DeviceManager', new Devices(em.config.deviceManager?.devices || []), events, defaults); - // this.c = { ...defaults, ...config }; - // const { em } = this.c; - this.devices = this.all; - // this.c.devices.forEach(dv => this.add(dv)); - // this.em = em; - // this.all = this.devices; + this.config.devices?.forEach(device => this.add(device, { silent: true })); this.select(this.config.default || this.devices.at(0)); - // this.__initListen(); em.on(chnSel, this._onSelect, this); return this; } diff --git a/src/device_manager/view/DevicesView.ts b/src/device_manager/view/DevicesView.ts index f2128dc57..b3ecab059 100644 --- a/src/device_manager/view/DevicesView.ts +++ b/src/device_manager/view/DevicesView.ts @@ -86,7 +86,7 @@ export default class DevicesView extends View { const { collection, em } = this; let result = ''; - collection.each(device => { + collection.forEach(device => { const { name, id } = device.attributes; const label = (em && em.t && em.t(`deviceManager.devices.${id}`)) || name; result += ``;