From a11a279c007b32a68c5f5fd9b2527ad2b0af5c17 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Tue, 16 Jan 2018 10:59:44 +0000
Subject: [PATCH] add msg. select to range and yaml nodes,

re-order son node (name to bottom)
add common.label.property to messages list
---
 nodes/core/locales/en-US/messages.json |  5 +++--
 nodes/core/logic/16-range.html         | 11 +++++++++++
 nodes/core/logic/16-range.js           | 13 ++++++++-----
 nodes/core/parsers/70-JSON.html        | 17 +++++++----------
 nodes/core/parsers/70-YAML.html        | 11 +++++++++++
 nodes/core/parsers/70-YAML.js          | 16 ++++++++++------
 6 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/nodes/core/locales/en-US/messages.json b/nodes/core/locales/en-US/messages.json
index 6665387ae..62339d81a 100644
--- a/nodes/core/locales/en-US/messages.json
+++ b/nodes/core/locales/en-US/messages.json
@@ -5,7 +5,8 @@
             "topic": "Topic",
             "name": "Name",
             "username": "Username",
-            "password": "Password"
+            "password": "Password",
+            "property": "Property"
         },
         "status": {
             "connected": "connected",
@@ -602,7 +603,7 @@
             "maxout": "e.g. 255"
         },
         "scale": {
-            "payload": "Scale msg.payload",
+            "payload": "Scale the message property",
             "limit": "Scale and limit to the target range",
             "wrap": "Scale and wrap within the target range"
         },
diff --git a/nodes/core/logic/16-range.html b/nodes/core/logic/16-range.html
index 321bec7e4..37d35fb85 100644
--- a/nodes/core/logic/16-range.html
+++ b/nodes/core/logic/16-range.html
@@ -1,5 +1,9 @@
 
 <script type="text/x-red" data-template-name="range">
+    <div class="form-row">
+        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
+        <input type="text" id="node-input-property" style="width:calc(70% - 1px)"/>
+    </div>
     <div class="form-row">
         <label for="node-input-action"><i class="fa fa-dot-circle-o"></i> <span data-i18n="range.label.action"></span></label>
         <select id="node-input-action" style="width:70%;">
@@ -65,6 +69,7 @@
             maxout: {value:"",required:true,validate:RED.validators.number()},
             action: {value:"scale"},
             round: {value:false},
+            property: {value:"payload",required:true},
             name: {value:""}
         },
         inputs: 1,
@@ -75,6 +80,12 @@
         },
         labelStyle: function() {
             return this.name ? "node_label_italic" : "";
+        },
+        oneditprepare: function() {
+            if (this.property === undefined) {
+                $("#node-input-property").val("payload");
+            }
+            $("#node-input-property").typedInput({default:'msg',types:['msg']});
         }
     });
 </script>
diff --git a/nodes/core/logic/16-range.js b/nodes/core/logic/16-range.js
index 1de073fee..b92b155ed 100644
--- a/nodes/core/logic/16-range.js
+++ b/nodes/core/logic/16-range.js
@@ -24,11 +24,13 @@ module.exports = function(RED) {
         this.maxin = Number(n.maxin);
         this.minout = Number(n.minout);
         this.maxout = Number(n.maxout);
+        this.property = n.property||"payload";
         var node = this;
 
         this.on('input', function (msg) {
-            if (msg.hasOwnProperty("payload")) {
-                var n = Number(msg.payload);
+            var value = RED.util.getMessageProperty(msg,node.property);
+            if (value !== undefined) {
+                var n = Number(value);
                 if (!isNaN(n)) {
                     if (node.action == "clamp") {
                         if (n < node.minin) { n = node.minin; }
@@ -38,11 +40,12 @@ module.exports = function(RED) {
                         var divisor = node.maxin - node.minin;
                         n = ((n - node.minin) % divisor + divisor) % divisor + node.minin;
                     }
-                    msg.payload = ((n - node.minin) / (node.maxin - node.minin) * (node.maxout - node.minout)) + node.minout;
-                    if (node.round) { msg.payload = Math.round(msg.payload); }
+                    value = ((n - node.minin) / (node.maxin - node.minin) * (node.maxout - node.minout)) + node.minout;
+                    if (node.round) { value = Math.round(value); }
+                    RED.util.setMessageProperty(msg,node.property,value);
                     node.send(msg);
                 }
-                else { node.log(RED._("range.errors.notnumber")+": "+msg.payload); }
+                else { node.log(RED._("range.errors.notnumber")+": "+value); }
             }
             else { node.send(msg); } // If no payload - just pass it on.
         });
diff --git a/nodes/core/parsers/70-JSON.html b/nodes/core/parsers/70-JSON.html
index f473c6039..01ffe42b3 100644
--- a/nodes/core/parsers/70-JSON.html
+++ b/nodes/core/parsers/70-JSON.html
@@ -1,9 +1,5 @@
 
 <script type="text/x-red" data-template-name="json">
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
-    </div>
     <div class="form-row">
         <label for="node-input-action"><span data-i18n="json.label.action"></span></label>
         <select style="width:70%" id="node-input-action">
@@ -14,11 +10,13 @@
     </div>
     <div class="form-row">
         <label data-i18n="json.label.property"></label>
-        <input type="text" id="node-input-property" style="width: 70%"/>
+        <input type="text" id="node-input-property" style="width:70%;"/>
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
-
     <hr align="middle"/>
-
     <div class="form-row node-json-to-json-options">
         <label style="width:100%; border-bottom: 1px solid #eee;"><span data-i18n="json.label.o2j"></span></label>
     </div>
@@ -55,7 +53,6 @@
        receives a String, no further checks will be made of the property. It will
        not check the String is valid JSON nor will it reformat it if the format option
        is selected.</p>
-
 </script>
 
 <script type="text/javascript">
@@ -64,8 +61,8 @@
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
-            property: { value:"payload" },
-            action: { value:"" },
+            property: {value:"payload",required:true},
+            action: {value:""},
             pretty: {value:false}
         },
         inputs:1,
diff --git a/nodes/core/parsers/70-YAML.html b/nodes/core/parsers/70-YAML.html
index 3f970e9e5..2f8914366 100644
--- a/nodes/core/parsers/70-YAML.html
+++ b/nodes/core/parsers/70-YAML.html
@@ -1,5 +1,9 @@
 
 <script type="text/x-red" data-template-name="yaml">
+    <div class="form-row">
+        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
+        <input type="text" id="node-input-property" style="width:calc(70% - 1px);"/>
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -30,6 +34,7 @@
         category: 'function',
         color:"#DEBD5C",
         defaults: {
+            property: {value:"payload",required:true},
             name: {value:""}
         },
         inputs:1,
@@ -40,6 +45,12 @@
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            if (this.property === undefined) {
+                $("#node-input-property").val("payload");
+            }
+            $("#node-input-property").typedInput({default:'msg',types:['msg']});
         }
     });
 </script>
diff --git a/nodes/core/parsers/70-YAML.js b/nodes/core/parsers/70-YAML.js
index ae4ca1a8c..1a34fdd57 100644
--- a/nodes/core/parsers/70-YAML.js
+++ b/nodes/core/parsers/70-YAML.js
@@ -4,20 +4,24 @@ module.exports = function(RED) {
     var yaml = require('js-yaml');
     function YAMLNode(n) {
         RED.nodes.createNode(this,n);
+        this.property = n.property||"payload";
         var node = this;
         this.on("input", function(msg) {
-            if (msg.hasOwnProperty("payload")) {
-                if (typeof msg.payload === "string") {
+            var value = RED.util.getMessageProperty(msg,node.property);
+            if (value !== undefined) {
+                if (typeof value === "string") {
                     try {
-                        msg.payload = yaml.load(msg.payload);
+                        value = yaml.load(value);
+                        RED.util.setMessageProperty(msg,node.property,value);
                         node.send(msg);
                     }
                     catch(e) { node.error(e.message,msg); }
                 }
-                else if (typeof msg.payload === "object") {
-                    if (!Buffer.isBuffer(msg.payload)) {
+                else if (typeof value === "object") {
+                    if (!Buffer.isBuffer(value)) {
                         try {
-                            msg.payload = yaml.dump(msg.payload);
+                            value = yaml.dump(value);
+                            RED.util.setMessageProperty(msg,node.property,value);
                             node.send(msg);
                         }
                         catch(e) {