From bb5a19b3fdbd12d8dfdd4bf6b6f33eb1dd008e5c Mon Sep 17 00:00:00 2001 From: Gerwin van Beek Date: Thu, 16 Jun 2022 10:02:16 +0200 Subject: [PATCH 1/6] Added tooltip option to all nodes --- .../@node-red/editor-client/src/js/ui/view.js | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js index a15ec32f4..9730594a5 100755 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -3104,6 +3104,7 @@ RED.view = (function() { var portLabelHoverTimeout = null; var portLabelHover = null; + var popover = null; function getElementPosition(node) { @@ -3661,18 +3662,24 @@ RED.view = (function() { this.parentNode.classList.add("red-ui-flow-node-hovered"); } clearTimeout(portLabelHoverTimeout); - if (d.hasOwnProperty('l')?!d.l : (d.type === "link in" || d.type === "link out")) { + + var displayLabel = d.hasOwnProperty('l')?!d.l : (d.type === "link in" || d.type === "link out"); + if (displayLabel || d._def.tooltip) { var parentNode = this.parentNode; portLabelHoverTimeout = setTimeout(function() { var tooltip; - if (d._def.label) { - tooltip = d._def.label; - try { + try { + if (d._def.tooltip) { + tooltip = d._def.tooltip; tooltip = (typeof tooltip === "function" ? tooltip.call(d) : tooltip)||""; - } catch(err) { - console.log("Definition error: "+d.type+".label",err); - tooltip = d.type; } + if (displayLabel && d._def.label && !tooltip){ + tooltip = d._def.label; + tooltip = (typeof tooltip === "function" ? tooltip.call(d) : tooltip)||""; + } + } catch(err) { + console.log("Definition error: "+d.type+".label",err); + tooltip = d.type; } if (tooltip !== "") { var pos = getElementPosition(parentNode); From 5494b06311875a690ab357909977f1defa5ef94e Mon Sep 17 00:00:00 2001 From: Gerwin van Beek Date: Thu, 16 Jun 2022 10:03:42 +0200 Subject: [PATCH 2/6] removed popover --- packages/node_modules/@node-red/editor-client/src/js/ui/view.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js index 9730594a5..199db6238 100755 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -3104,7 +3104,6 @@ RED.view = (function() { var portLabelHoverTimeout = null; var portLabelHover = null; - var popover = null; function getElementPosition(node) { From 5e23920c43da0f9c778d12bec11277599dca44cc Mon Sep 17 00:00:00 2001 From: Gerwin van Beek Date: Thu, 16 Jun 2022 17:19:37 +0200 Subject: [PATCH 3/6] info instead of tooltip --- .../@node-red/editor-client/src/js/ui/view.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js index 199db6238..f1268f156 100755 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -3663,19 +3663,13 @@ RED.view = (function() { clearTimeout(portLabelHoverTimeout); var displayLabel = d.hasOwnProperty('l')?!d.l : (d.type === "link in" || d.type === "link out"); - if (displayLabel || d._def.tooltip) { + if (displayLabel || d.info) { var parentNode = this.parentNode; portLabelHoverTimeout = setTimeout(function() { var tooltip; try { - if (d._def.tooltip) { - tooltip = d._def.tooltip; - tooltip = (typeof tooltip === "function" ? tooltip.call(d) : tooltip)||""; - } - if (displayLabel && d._def.label && !tooltip){ - tooltip = d._def.label; - tooltip = (typeof tooltip === "function" ? tooltip.call(d) : tooltip)||""; - } + var label = displayLabel ? (typeof d._def.label === "function" ? d._def.label.call(d) : d._def.label)||"" : ""; + tooltip = `${label ? label : ''}${d.info && label ? ': ': ''}${d.info ? d.info : ''}`; } catch(err) { console.log("Definition error: "+d.type+".label",err); tooltip = d.type; From 92e40020bebbeaa0024947f56cfc28c35a59690d Mon Sep 17 00:00:00 2001 From: Gerwin van Beek Date: Thu, 11 Aug 2022 19:45:16 +0200 Subject: [PATCH 4/6] Option to set null/undefined properties with setObjectProperty --- packages/node_modules/@node-red/util/lib/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js index d82de0d1d..85c7f317f 100644 --- a/packages/node_modules/@node-red/util/lib/util.js +++ b/packages/node_modules/@node-red/util/lib/util.js @@ -473,7 +473,7 @@ function setObjectProperty(msg,prop,value,createMissing) { for (var i=0;i 1 && ((typeof obj[key] !== "object" && typeof obj[key] !== "function") || obj[key] === null)) { // Break out early as we cannot create a property beneath // this type of value From 16771fc5b466d5698238159cc3e2ffeafea17c4c Mon Sep 17 00:00:00 2001 From: Gerwin van Beek Date: Thu, 11 Aug 2022 19:48:37 +0200 Subject: [PATCH 5/6] Option to set null/undefined properties with setObjectProperty --- packages/node_modules/@node-red/util/lib/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js index d82de0d1d..85c7f317f 100644 --- a/packages/node_modules/@node-red/util/lib/util.js +++ b/packages/node_modules/@node-red/util/lib/util.js @@ -473,7 +473,7 @@ function setObjectProperty(msg,prop,value,createMissing) { for (var i=0;i 1 && ((typeof obj[key] !== "object" && typeof obj[key] !== "function") || obj[key] === null)) { // Break out early as we cannot create a property beneath // this type of value From 357430d7bbcfbf7a8eb7b2ae24a87e62963aa872 Mon Sep 17 00:00:00 2001 From: Gerwin van Beek Date: Thu, 11 Aug 2022 19:51:55 +0200 Subject: [PATCH 6/6] Revert "Option to set null/undefined properties with setObjectProperty" This reverts commit 92e40020bebbeaa0024947f56cfc28c35a59690d. --- packages/node_modules/@node-red/util/lib/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js index 85c7f317f..d82de0d1d 100644 --- a/packages/node_modules/@node-red/util/lib/util.js +++ b/packages/node_modules/@node-red/util/lib/util.js @@ -473,7 +473,7 @@ function setObjectProperty(msg,prop,value,createMissing) { for (var i=0;i 1 && ((typeof obj[key] !== "object" && typeof obj[key] !== "function") || obj[key] === null)) { // Break out early as we cannot create a property beneath // this type of value