Merge branch 'port-selector-fixes'

* port-selector-fixes: Fixes gh-274: Correctly generates an ID for the portSelector selectbox. Also namespaces some listeners and improves the configurability of labels.
lichen-community-systems · Jan 22, 2019 · 3b9023d · 3b9023d
2 parents aa256eb + 73ef766
commit 3b9023d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/ui/midi/midi-port-selector/js/midi-port-selector.js b/src/ui/midi/midi-port-selector/js/midi-port-selector.js
@@ -123,8 +123,8 @@ var fluid = fluid || require("infusion"),
         },
 
         markup: {
-            label: "<label for='%selectBoxID'>%selectBoxLabel:</label>",
-            selectBox: "<select class='flock-midi-selector-selectBox' id='%selectBoxId'></select>",
+            label: "<label for='%selectBoxID'>%selectBoxLabel</label>",
+            selectBox: "<select class='flock-midi-selector-selectBox' id='%selectBoxID'></select>",
             refreshButton: "<button name='refresh'>%refreshButtonLabel</button>"
         },
 
@@ -135,7 +135,7 @@ var fluid = fluid || require("infusion"),
         },
 
         strings: {
-            selectBoxLabel: "MIDI Port",
+            selectBoxLabel: "MIDI Port:",
             refreshButtonLabel: "Refresh"
         },
 

diff --git a/src/ui/selectbox/js/selectbox.js b/src/ui/selectbox/js/selectbox.js
@@ -85,8 +85,17 @@ var fluid = fluid || require("infusion"),
         },
 
         modelListeners: {
-            groups: "{that}.refreshView()",
-            options: "{that}.refreshView()"
+            groups: {
+                namespace: "refreshView",
+                excludeSource: "init",
+                func: "{that}.refreshView"
+            },
+
+            options: {
+                namespace: "refreshView",
+                excludeSource: "init",
+                func: "{that}.refreshView"
+            }
         },
 
         listeners: {