From 84e02fc144167ded0256fb515bd7b92dc0e8ea9e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 25 Apr 2022 20:30:05 +0100
Subject: [PATCH] Remove name generation from link call and add to Function

---
 .../@node-red/nodes/core/common/21-debug.html    |  4 ++--
 .../@node-red/nodes/core/common/60-link.html     | 16 +++++-----------
 .../nodes/core/function/10-function.html         |  8 +++++++-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.html b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
index e509225d5..c511397bf 100644
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
@@ -74,7 +74,7 @@
     RED.nodes.registerType('debug',{
         category: 'common',
         defaults: {
-            name: {value:"_"},
+            name: {value:"_DEFAULT_"},
             active: {value:true},
             tosidebar: {value:true},
             console: {value:false},
@@ -546,7 +546,7 @@
             $("#node-input-statusVal").val($("#node-input-typed-status").typedInput('value'));
         },
         onadd: function() {
-            if (this.name === '_') {
+            if (this.name === '_DEFAULT_') {
                 this.name = ''
                 RED.actions.invoke("core:generate-node-names", this)
             }
diff --git a/packages/node_modules/@node-red/nodes/core/common/60-link.html b/packages/node_modules/@node-red/nodes/core/common/60-link.html
index 7d6c26762..951ac6d1d 100644
--- a/packages/node_modules/@node-red/nodes/core/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/common/60-link.html
@@ -218,7 +218,7 @@
     }
 
     function onAdd() {
-        if (this.name === '_') {
+        if (this.name === '_DEFAULT_') {
             this.name = ''
             RED.actions.invoke("core:generate-node-names", this)
         }
@@ -235,7 +235,7 @@
         category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
-            name: { value: "_" },
+            name: { value: "_DEFAULT_" },
             links: { value: [], type:"link out[]" }
         },
         inputs:0,
@@ -271,7 +271,7 @@
         category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
-            name: { value: "_" },
+            name: { value: "" },
             links: { value: [], type:"link in[]" },
             linkType: { value:"static" },
             timeout: { value: "30", validate:RED.validators.number(true) }
@@ -319,20 +319,14 @@
         oneditsave: function() {
             onEditSave(this);
         },
-        oneditresize: resizeNodeList,
-        onadd: function() {
-            if (this.name === '_') {
-                this.name = ''
-                RED.actions.invoke("core:generate-node-names", this)
-            }
-        }
+        oneditresize: resizeNodeList
     });
 
     RED.nodes.registerType('link out',{
         category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
-            name: { value:"_" },
+            name: { value:"_DEFAULT_" },
             mode: { value: "link" },// link || return
             links: { value: [], type:"link in[]" }
         },
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
index 8d4145a68..d107a4bb9 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -355,7 +355,7 @@
         color:"#fdd0a2",
         category: 'function',
         defaults: {
-            name: {value:""},
+            name: {value:"_DEFAULT_"},
             func: {value:"\nreturn msg;"},
             outputs: {value:1},
             noerr: {value:0,required:true,validate:function(v) { return !v; }},
@@ -605,6 +605,12 @@
             this.finalizeEditor.resize();
 
             $("#node-input-libs-container").css("height", (height - 192)+"px");
+        },
+        onadd: function() {
+            if (this.name === '_DEFAULT_') {
+                this.name = ''
+                RED.actions.invoke("core:generate-node-names", this)
+            }
         }
     });
 })();