From ea76c18f59ad295e68307e3f5eb2294b8fef40f6 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sat, 4 Jun 2016 09:04:58 +0100
Subject: [PATCH] Add some info words to config nodes

---
 nodes/core/io/10-mqtt.html      | 32 ++++++++++++++++++--------------
 nodes/core/io/22-websocket.html | 17 ++++++++---------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/nodes/core/io/10-mqtt.html b/nodes/core/io/10-mqtt.html
index c80818c26..ebcc6ea61 100644
--- a/nodes/core/io/10-mqtt.html
+++ b/nodes/core/io/10-mqtt.html
@@ -227,9 +227,13 @@
             </div>
         </div>
     </div>
+</script>
 
-
-
+<script type="text/x-red" data-help-name="mqtt-broker">
+    <p>A minimum MQTT broker connecton requires only a broker server address to be added to the default configuration.</p>
+    <p>To secure the connection with SSL/TLS, a TLS Configuration must also be configured and selected.</p>
+    <p>If you create a Client ID it must be unique to the broker you are connecting to.</p>
+    <p>For more information about MQTT see the <a href="http://www.eclipse.org/paho/" target="_new">Eclipse Paho</a> site.</p>
 </script>
 
 <script type="text/javascript">
@@ -239,14 +243,14 @@
             broker: {value:"",required:true},
             port: {value:1883,required:true,validate:RED.validators.number()},
             tls: {type:"tls-config",required: false},
-            clientid: { value:"", validate: function(v) {
-                if ($("#node-config-input-clientid").length) {
-                    // Currently editing the node
-                    return $("#node-config-input-cleansession").is(":checked") || v.length > 0;
-                } else {
-                    return this.cleansession || v.length > 0;
-                }
-            }},
+            clientid: {value:"", validate: function(v) {
+                    if ($("#node-config-input-clientid").length) {
+                        // Currently editing the node
+                        return $("#node-config-input-cleansession").is(":checked") || v.length > 0;
+                    } else {
+                        return this.cleansession || v.length > 0;
+                    }
+                }},
             usetls: {value: false},
             verifyservercert: { value: false},
             compatmode: { value: true},
@@ -266,7 +270,7 @@
             password: {type: "password"}
         },
         label: function() {
-            if (this.broker == "") { this.broker = "localhost"; }
+            if (this.broker === "") { this.broker = "localhost"; }
             return (this.clientid?this.clientid+"@":"")+this.broker+":"+this.port;
         },
         oneditprepare: function () {
@@ -298,15 +302,15 @@
                 this.cleansession = true;
                 $("#node-config-input-cleansession").prop("checked",true);
             }
-            if (typeof this.usetls  === 'undefined'){
+            if (typeof this.usetls === 'undefined') {
                 this.usetls = false;
                 $("#node-config-input-usetls").prop("checked",false);
             }
-            if (typeof this.compatmode  === 'undefined'){
+            if (typeof this.compatmode === 'undefined') {
                 this.compatmode = true;
                 $("#node-config-input-compatmode").prop('checked', true);
             }
-            if (typeof this.keepalive  === 'undefined'){
+            if (typeof this.keepalive === 'undefined') {
                 this.keepalive = 15;
                 $("#node-config-input-keepalive").val(this.keepalive);
             }
diff --git a/nodes/core/io/22-websocket.html b/nodes/core/io/22-websocket.html
index 88ccb6a96..d6849ef1b 100644
--- a/nodes/core/io/22-websocket.html
+++ b/nodes/core/io/22-websocket.html
@@ -49,8 +49,8 @@
 
     function ws_oneditprepare() {
         $("#websocket-client-row").hide();
-        $("#node-input-mode").change(function(){
-            if( $("#node-input-mode").val() === 'client') {
+        $("#node-input-mode").change(function() {
+            if ( $("#node-input-mode").val() === 'client') {
                 $("#websocket-server-row").hide();
                 $("#websocket-client-row").show();
             }
@@ -60,7 +60,7 @@
             }
         });
 
-        if(this.client) {
+        if (this.client) {
             $("#node-input-mode").val('client').change();
         }
         else {
@@ -69,7 +69,7 @@
     }
 
     function ws_oneditsave() {
-        if($("#node-input-mode").val() === 'client') {
+        if ($("#node-input-mode").val() === 'client') {
             $("#node-input-server").append('<option value="">Dummy</option>');
             $("#node-input-server").val('');
         }
@@ -86,7 +86,7 @@
     }
 
     function ws_validateserver() {
-        if($("#node-input-mode").val() === 'client' || (this.client && !this.server)) {
+        if ($("#node-input-mode").val() === 'client' || (this.client && !this.server)) {
             return true;
         }
         else {
@@ -95,7 +95,7 @@
     }
 
     function ws_validateclient() {
-        if($("#node-input-mode").val() === 'client' || (this.client && !this.server)) {
+        if ($("#node-input-mode").val() === 'client' || (this.client && !this.server)) {
             return RED.nodes.node(this.client) != null;
         }
         else {
@@ -167,7 +167,7 @@
             if (root.slice(-1) == "/") {
                 root = root.slice(0,-1);
             }
-            if (root == "") {
+            if (root === "") {
                 $("#node-config-ws-tip").hide();
             } else {
                 $("#node-config-ws-path").html(root);
@@ -248,7 +248,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="websocket-listener">
-   <p>This configuration node creates a WebSocket Server using the specified path</p>
+   <p>This configuration node creates a WebSocket Server endpoint using the specified path.</p>
 </script>
 
 <!-- WebSocket Client configuration node -->
@@ -273,4 +273,3 @@
 <script type="text/x-red" data-help-name="websocket-client">
    <p>This configuration node connects a WebSocket client to the specified URL.</p>
 </script>
-