fix handling of {{msg.property}} for label

Dave Conway-Jones · Dave Conway-Jones · commit 1b7e46cbc019 · 2018-12-09T23:55:50.000Z
diff --git a/src/components/ui-component/ui-component-ctrl.js b/src/components/ui-component/ui-component-ctrl.js
@@ -159,7 +159,8 @@ angular.module('ui').controller('uiComponentController', ['$scope', 'UiEvents',
                     }
                     $scope.$watch('me.item.value', function() {
                         if ((me.item.dynOutput === "true") && (me.item.value !== "")) {
-                            me.valueChanged(20); }
+                            me.valueChanged(20);
+                        }
                     });
                     break;
                 }
diff --git a/ui.js b/ui.js
@@ -223,8 +223,8 @@ function add(opt) {
                             if (b.indexOf(".") !== -1) { b = b.split(".")[0]; }
                             if (b.indexOf("[") !== -1) { b = b.split("[")[0]; }
                             if (!toEmit.hasOwnProperty(b) && msg.hasOwnProperty(b)) {
-                                if (Buffer.isBuffer(msg[b])) { toEmit.msg[b] = msg[b].toString("binary"); }
-                                else { toEmit.msg[b] = JSON.parse(JSON.stringify(msg[b])); }
+                                if (Buffer.isBuffer(msg[b])) { toEmit[b] = msg[b].toString("binary"); }
+                                else { toEmit[b] = JSON.parse(JSON.stringify(msg[b])); }
                             }
                         }
                     }
@@ -238,7 +238,6 @@ function add(opt) {
             addField("units");
             if (msg.hasOwnProperty("enabled")) { toEmit.disabled = !msg.enabled; }
             toEmit.id = toStore.id = opt.node.id;
-
             // Emit and Store the data
             //if (settings.verbose) { console.log("UI-EMIT",JSON.stringify(toEmit)); }
             io.emit(updateValueEventName, toEmit);

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ angular.module('ui').controller('uiComponentController', ['$scope', 'UiEvents',`
`159`	`159`	`}`
`160`	`160`	`$scope.$watch('me.item.value', function() {`
`161`	`161`	`if ((me.item.dynOutput === "true") && (me.item.value !== "")) {`
`162`		`- me.valueChanged(20); }`
	`162`	`+ me.valueChanged(20);`
	`163`	`+ }`
`163`	`164`	`});`
`164`	`165`	`break;`
`165`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,8 +223,8 @@ function add(opt) {`
`223`	`223`	`if (b.indexOf(".") !== -1) { b = b.split(".")[0]; }`
`224`	`224`	`if (b.indexOf("[") !== -1) { b = b.split("[")[0]; }`
`225`	`225`	`if (!toEmit.hasOwnProperty(b) && msg.hasOwnProperty(b)) {`
`226`		`- if (Buffer.isBuffer(msg[b])) { toEmit.msg[b] = msg[b].toString("binary"); }`
`227`		`- else { toEmit.msg[b] = JSON.parse(JSON.stringify(msg[b])); }`
	`226`	`+ if (Buffer.isBuffer(msg[b])) { toEmit[b] = msg[b].toString("binary"); }`
	`227`	`+ else { toEmit[b] = JSON.parse(JSON.stringify(msg[b])); }`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`	`}`
`@@ -238,7 +238,6 @@ function add(opt) {`
`238`	`238`	`addField("units");`
`239`	`239`	`if (msg.hasOwnProperty("enabled")) { toEmit.disabled = !msg.enabled; }`
`240`	`240`	`toEmit.id = toStore.id = opt.node.id;`
`241`		`-`
`242`	`241`	`// Emit and Store the data`
`243`	`242`	`//if (settings.verbose) { console.log("UI-EMIT",JSON.stringify(toEmit)); }`
`244`	`243`	`io.emit(updateValueEventName, toEmit);`