keep name in channel input (#15)

rdmtc · Aug 24, 2018 · 7de5318 · 7de5318
1 parent b943428
commit 7de5318
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/nodes/ccu-value.html b/nodes/ccu-value.html
@@ -26,14 +26,13 @@
         paletteLabel: 'value',
         align: 'right',
         label() {
-            return this.name || 'value';
+            return this.name || String(this.channel).replace(/^[A-Za-z0-9-]+:[0-9] /, '') || 'value';
         },
         oneditprepare() {
             const $nodeInputIface = $('#node-input-iface');
             const $nodeInputMode = $('#node-input-mode');
             const $nodeInputCcuConfig = $('#node-input-ccuConfig');
             const $nodeInputChannel = $('#node-input-channel');
-            const $nodeInputName = $('#node-input-name');
             const $nodeInputDatapoint = $('#node-input-datapoint');
 
             let data;
@@ -108,12 +107,6 @@
             $nodeInputChannel.autocomplete({
                 source: [],
                 close: () => {
-                    const n = $nodeInputChannel.val().split(' ');
-                    const channel = n.shift();
-                    $nodeInputChannel.val(channel);
-                    if (!$nodeInputName.val()) {
-                        $nodeInputName.val(n.join(' '));
-                    }
                     autocompleteDatapoint();
                 },
                 delay: 0,

diff --git a/nodes/ccu-value.js b/nodes/ccu-value.js
@@ -23,7 +23,7 @@ module.exports = function (RED) {
                     iface: config.iface,
                     cache: config.cache,
                     change: config.change,
-                    channel: (config.channel || '').split(' ')[0],
+                    channel: String(config.channel).split(' ')[0],
                     datapoint: config.datapoint
                 };