From 43c1929b7da39001659d20c5366d87343369f7fd Mon Sep 17 00:00:00 2001 From: Luciano Iam Date: Sat, 25 Jul 2020 17:45:39 +0200 Subject: [PATCH] WS: Add strip labels in the mixer demo Plus some minor widget code and layout improvements --- share/web_surfaces/builtin/mixer/js/main.js | 1 + share/web_surfaces/builtin/mixer/js/tkwidget.js | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/share/web_surfaces/builtin/mixer/js/main.js b/share/web_surfaces/builtin/mixer/js/main.js index 7c7601a19b..8427e89aba 100644 --- a/share/web_surfaces/builtin/mixer/js/main.js +++ b/share/web_surfaces/builtin/mixer/js/main.js @@ -72,6 +72,7 @@ import { createRootContainer, Container, Dialog, Label, Button, DiscreteKnob, const pan = new PanKnob(); pan.appendTo(container); + if (!strip.isVca) { pan.bindTo(strip, 'pan'); } diff --git a/share/web_surfaces/builtin/mixer/js/tkwidget.js b/share/web_surfaces/builtin/mixer/js/tkwidget.js index 288d5c4fa4..1769d677b2 100644 --- a/share/web_surfaces/builtin/mixer/js/tkwidget.js +++ b/share/web_surfaces/builtin/mixer/js/tkwidget.js @@ -19,13 +19,10 @@ import loadToolkit from './tkloader.js'; import { BaseWidget, BaseContainer, BaseDialog, BaseControl } from './widget.js'; -let _tkRoot = null; - export async function createRootContainer () { await loadToolkit(); - _tkRoot = new TK.Root({id: 'root'}); const root = new Container(); - root.tk = _tkRoot; + root.tk = new TK.Root({id: 'root'}); document.body.appendChild(root.element); return root; }