From 395210e4f09ab70a8d9698177e8cf8a2f6941dcd Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sat, 24 Jun 2017 12:15:03 +0100
Subject: [PATCH] destroy editor to ensure fully removed on close (function,
 template, comment)

to close #1279
---
 nodes/core/core/80-function.html | 4 +++-
 nodes/core/core/80-function.js   | 2 +-
 nodes/core/core/80-template.html | 6 ++++--
 nodes/core/core/90-comment.html  | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/nodes/core/core/80-function.html b/nodes/core/core/80-function.html
index 6e165473b..f9fbfc4a7 100644
--- a/nodes/core/core/80-function.html
+++ b/nodes/core/core/80-function.html
@@ -117,15 +117,17 @@
                 }
             }
             $("#node-input-func").val(this.editor.getValue());
+            this.editor.destroy();
             delete this.editor;
         },
         oneditcancel: function() {
+            this.editor.destroy();
             delete this.editor;
         },
         oneditresize: function(size) {
             var rows = $("#dialog-form>div:not(.node-text-editor-row)");
             var height = $("#dialog-form").height();
-            for (var i=0;i<rows.size();i++) {
+            for (var i=0; i<rows.size(); i++) {
                 height -= $(rows[i]).outerHeight(true);
             }
             var editorRow = $("#dialog-form>div.node-text-editor-row");
diff --git a/nodes/core/core/80-function.js b/nodes/core/core/80-function.js
index 3a4f81d55..e4c8949e2 100644
--- a/nodes/core/core/80-function.js
+++ b/nodes/core/core/80-function.js
@@ -26,7 +26,7 @@ module.exports = function(RED) {
             msgs = [msgs];
         }
         var msgCount = 0;
-        for (var m=0;m<msgs.length;m++) {
+        for (var m=0; m<msgs.length; m++) {
             if (msgs[m]) {
                 if (!util.isArray(msgs[m])) {
                     msgs[m] = [msgs[m]];
diff --git a/nodes/core/core/80-template.html b/nodes/core/core/80-template.html
index bd56a5c75..9c3d83e21 100644
--- a/nodes/core/core/80-template.html
+++ b/nodes/core/core/80-template.html
@@ -133,16 +133,18 @@
             });
         },
         oneditsave: function() {
-            $("#node-input-template").val(this.editor.getValue())
+            $("#node-input-template").val(this.editor.getValue());
+            this.editor.destroy();
             delete this.editor;
         },
         oneditcancel: function() {
+            this.editor.destroy();
             delete this.editor;
         },
         oneditresize: function(size) {
             var rows = $("#dialog-form>div:not(.node-text-editor-row)");
             var height = $("#dialog-form").height();
-            for (var i=0;i<rows.size();i++) {
+            for (var i=0; i<rows.size(); i++) {
                 height -= $(rows[i]).outerHeight(true);
             }
             var editorRow = $("#dialog-form>div.node-text-editor-row");
diff --git a/nodes/core/core/90-comment.html b/nodes/core/core/90-comment.html
index 4d2652c4f..2f65eeec3 100644
--- a/nodes/core/core/90-comment.html
+++ b/nodes/core/core/90-comment.html
@@ -52,15 +52,17 @@
         },
         oneditsave: function() {
             $("#node-input-info").val(this.editor.getValue());
+            this.editor.destroy();
             delete this.editor;
         },
         oneditcancel: function() {
+            this.editor.destroy();
             delete this.editor;
         },
         oneditresize: function(size) {
             var rows = $("#dialog-form>div:not(.node-text-editor-row)");
             var height = $("#dialog-form").height();
-            for (var i=0;i<rows.size();i++) {
+            for (var i=0; i<rows.size(); i++) {
                 height -= $(rows[i]).outerHeight(true);
             }
             var editorRow = $("#dialog-form>div.node-text-editor-row");