mirror of https://github.com/node-red/node-red.git
Merge a823c5abd4
into 1eb9aa0eed
commit
6ee08ef375
|
@ -3836,7 +3836,9 @@ 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.info) {
|
||||
var parentNode = this.parentNode;
|
||||
portLabelHoverTimeout = setTimeout(function() {
|
||||
//check see if node has been deleted since timeout started
|
||||
|
@ -3844,14 +3846,12 @@ RED.view = (function() {
|
|||
return; //node is gone!
|
||||
}
|
||||
var tooltip;
|
||||
if (d._def.label) {
|
||||
tooltip = d._def.label;
|
||||
try {
|
||||
tooltip = (typeof tooltip === "function" ? tooltip.call(d) : tooltip)||"";
|
||||
} catch(err) {
|
||||
console.log("Definition error: "+d.type+".label",err);
|
||||
tooltip = d.type;
|
||||
}
|
||||
try {
|
||||
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;
|
||||
}
|
||||
if (tooltip !== "") {
|
||||
var pos = getElementPosition(parentNode);
|
||||
|
|
Loading…
Reference in New Issue