From 0136ebd2b42fd9f876396f28d739464a7a9ef365 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 26 Jul 2016 16:19:27 +0100
Subject: [PATCH] Fix invalid html in TCP and HTML node edit templates

---
 nodes/core/io/31-tcpin.html     | 45 +++++++++++++++++----------------
 nodes/core/parsers/70-HTML.html |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/nodes/core/io/31-tcpin.html b/nodes/core/io/31-tcpin.html
index b0e782f76..6cd4775dd 100644
--- a/nodes/core/io/31-tcpin.html
+++ b/nodes/core/io/31-tcpin.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2013, 2016 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -225,27 +225,6 @@
         <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>
-    <script>
-        var previous = null;
-        $("#node-input-out").on('focus', function () { previous = this.value; }).change(function() {
-            if (previous == null) { previous = $("#node-input-out").val(); }
-            if ($("#node-input-out").val() == "char") {
-                if (previous != "char") $("#node-input-splitc").val("\\n");
-                $("#node-units").text("");
-            }
-            else if ($("#node-input-out").val() == "time") {
-                if (previous != "time") $("#node-input-splitc").val("0");
-                $("#node-units").text("ms");
-            }
-            else if ($("#node-input-out").val() == "count") {
-                if (previous != "count") $("#node-input-splitc").val("12");
-                $("#node-units").text("chars");
-            }
-            else {
-                if (previous != "sit") $("#node-input-splitc").val("0");
-                $("#node-units").text("");
-            }
-        });
 </script>
 
 <script type="text/x-red" data-help-name="tcp request">
@@ -276,6 +255,28 @@
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            var previous = null;
+            $("#node-input-out").on('focus', function () { previous = this.value; }).change(function() {
+                if (previous == null) { previous = $("#node-input-out").val(); }
+                if ($("#node-input-out").val() == "char") {
+                    if (previous != "char") $("#node-input-splitc").val("\\n");
+                    $("#node-units").text("");
+                }
+                else if ($("#node-input-out").val() == "time") {
+                    if (previous != "time") $("#node-input-splitc").val("0");
+                    $("#node-units").text("ms");
+                }
+                else if ($("#node-input-out").val() == "count") {
+                    if (previous != "count") $("#node-input-splitc").val("12");
+                    $("#node-units").text("chars");
+                }
+                else {
+                    if (previous != "sit") $("#node-input-splitc").val("0");
+                    $("#node-units").text("");
+                }
+            });
         }
     });
 </script>
diff --git a/nodes/core/parsers/70-HTML.html b/nodes/core/parsers/70-HTML.html
index e7c01e20b..c3f4a6536 100644
--- a/nodes/core/parsers/70-HTML.html
+++ b/nodes/core/parsers/70-HTML.html
@@ -46,7 +46,7 @@
 <script type="text/x-red" data-help-name="html">
     <p>Extracts elements from an html document held in <code>msg.payload</code> using a selector.</p>
     <p>If left blank the selector may be set dynamically by passing in <code>msg.select</code> along with the <code>msg.payload</code>.
-    <p>The selector uses <a href=="https://github.com/cheeriojs/cheerio/blob/master/Readme.md" target="_new">Cheerio</a>
+    <p>The selector uses <a href="https://github.com/cheeriojs/cheerio/blob/master/Readme.md" target="_new">Cheerio</a>
      which uses the <a href="https://github.com/fb55/CSSselect#user-content-supported-selectors" target="_new">CSS selector</a> syntax.</p>
     <p>The result can be either a single message with a payload containing an array of the matched elements, or multiple
        messages that each contain a matched element.</p>