destroy editor to ensure fully removed on close (function, template, …

…comment) to close #1279
node-red · Jun 24, 2017 · 395210e · 395210e
1 parent e23354b
commit 395210e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/nodes/core/core/80-function.html b/nodes/core/core/80-function.html
@@ -117,15 +117,17 @@ <h4>Logging and Error Handling</h4>
                 }
             }
             $("#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
@@ -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
@@ -133,16 +133,18 @@ <h3>Details</h3>
             });
         },
         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
@@ -52,15 +52,17 @@ <h3>Details</h3>
         },
         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");