mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Merge pull request #1906 from node-red/Allow-button-to-be-invisible
If debug set not to go to sidebar hide the button
This commit is contained in:
commit
a4ddfd404f
@ -1961,11 +1961,8 @@ RED.view = (function() {
|
|||||||
.on("mouseover",function(d){portMouseOver(d3.select(this),d,PORT_TYPE_OUTPUT,0);})
|
.on("mouseover",function(d){portMouseOver(d3.select(this),d,PORT_TYPE_OUTPUT,0);})
|
||||||
.on("mouseout",function(d) {portMouseOut(d3.select(this),d,PORT_TYPE_OUTPUT,0);});
|
.on("mouseout",function(d) {portMouseOut(d3.select(this),d,PORT_TYPE_OUTPUT,0);});
|
||||||
|
|
||||||
|
|
||||||
inGroup.append("svg:text").attr("class","port_label").attr("x",18).attr("y",20).style("font-size","10px").text("input");
|
inGroup.append("svg:text").attr("class","port_label").attr("x",18).attr("y",20).style("font-size","10px").text("input");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
subflowOutputs.each(function(d,i) {
|
subflowOutputs.each(function(d,i) {
|
||||||
if (d.dirty) {
|
if (d.dirty) {
|
||||||
var output = d3.select(this);
|
var output = d3.select(this);
|
||||||
@ -2306,7 +2303,6 @@ RED.view = (function() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
thisNode.selectAll(".node_tools").attr("x",function(d){return d.w-35;}).attr("y",function(d){return d.h-20;});
|
thisNode.selectAll(".node_tools").attr("x",function(d){return d.w-35;}).attr("y",function(d){return d.h-20;});
|
||||||
|
|
||||||
thisNode.selectAll(".node_changed")
|
thisNode.selectAll(".node_changed")
|
||||||
@ -2318,8 +2314,8 @@ RED.view = (function() {
|
|||||||
.classed("hidden",function(d) { return d.valid; });
|
.classed("hidden",function(d) { return d.valid; });
|
||||||
|
|
||||||
thisNode.selectAll(".port_input").each(function(d,i) {
|
thisNode.selectAll(".port_input").each(function(d,i) {
|
||||||
var port = d3.select(this);
|
var port = d3.select(this);
|
||||||
port.attr("transform",function(d){return "translate(-5,"+((d.h/2)-5)+")";})
|
port.attr("transform",function(d){return "translate(-5,"+((d.h/2)-5)+")";})
|
||||||
});
|
});
|
||||||
|
|
||||||
thisNode.selectAll(".node_icon").attr("y",function(d){return (d.h-d3.select(this).attr("height"))/2;});
|
thisNode.selectAll(".node_icon").attr("y",function(d){return (d.h-d3.select(this).attr("height"))/2;});
|
||||||
@ -2333,21 +2329,30 @@ RED.view = (function() {
|
|||||||
return (activeSubflow||!isButtonEnabled(d))?"":"pointer";
|
return (activeSubflow||!isButtonEnabled(d))?"":"pointer";
|
||||||
});
|
});
|
||||||
thisNode.selectAll(".node_right_button").attr("transform",function(d){
|
thisNode.selectAll(".node_right_button").attr("transform",function(d){
|
||||||
var x = d.w-6;
|
var x = d.w-6;
|
||||||
if (d._def.button.toggle && !d[d._def.button.toggle]) {
|
if (d._def.button.toggle && !d[d._def.button.toggle]) {
|
||||||
x = x - 8;
|
x = x - 8;
|
||||||
}
|
}
|
||||||
return "translate("+x+",2)";
|
return "translate("+x+",2)";
|
||||||
});
|
});
|
||||||
thisNode.selectAll(".node_right_button rect").attr("fill-opacity",function(d){
|
thisNode.selectAll(".node_right_button rect").attr("fill-opacity",function(d){
|
||||||
if (d._def.button.toggle) {
|
if (d._def.button.toggle) {
|
||||||
return d[d._def.button.toggle]?1:0.2;
|
return d[d._def.button.toggle]?1:0.2;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (d._def.button && (typeof d._def.button.visible === "function")) { // is defined and a function...
|
||||||
|
if (d._def.button.visible.call(d) === false) {
|
||||||
|
thisNode.selectAll(".node_button").style("display","none");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
thisNode.selectAll(".node_button").style("display","inherit");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//thisNode.selectAll(".node_right_button").attr("transform",function(d){return "translate("+(d.w - d._def.button.width.call(d))+","+0+")";}).attr("fill",function(d) {
|
//thisNode.selectAll(".node_right_button").attr("transform",function(d){return "translate("+(d.w - d._def.button.width.call(d))+","+0+")";}).attr("fill",function(d) {
|
||||||
// return typeof d._def.button.color === "function" ? d._def.button.color.call(d):(d._def.button.color != null ? d._def.button.color : d._def.color)
|
// return typeof d._def.button.color === "function" ? d._def.button.color.call(d):(d._def.button.color != null ? d._def.button.color : d._def.color)
|
||||||
//});
|
//});
|
||||||
|
|
||||||
thisNode.selectAll(".node_badge_group").attr("transform",function(d){return "translate("+(d.w-40)+","+(d.h+3)+")";});
|
thisNode.selectAll(".node_badge_group").attr("transform",function(d){return "translate("+(d.w-40)+","+(d.h+3)+")";});
|
||||||
|
@ -73,6 +73,7 @@
|
|||||||
align: "right",
|
align: "right",
|
||||||
button: {
|
button: {
|
||||||
toggle: "active",
|
toggle: "active",
|
||||||
|
visible: function() { return this.tosidebar; },
|
||||||
onclick: function() {
|
onclick: function() {
|
||||||
var label = this.name||"debug";
|
var label = this.name||"debug";
|
||||||
var node = this;
|
var node = this;
|
||||||
@ -84,7 +85,7 @@
|
|||||||
t:'edit',
|
t:'edit',
|
||||||
node:node,
|
node:node,
|
||||||
changes:{
|
changes:{
|
||||||
active: !node.active
|
active:!node.active
|
||||||
},
|
},
|
||||||
dirty:node.dirty,
|
dirty:node.dirty,
|
||||||
changed:node.changed
|
changed:node.changed
|
||||||
|
@ -19,10 +19,7 @@ module.exports = function(RED) {
|
|||||||
if (this.tosidebar === undefined) { this.tosidebar = true; }
|
if (this.tosidebar === undefined) { this.tosidebar = true; }
|
||||||
this.severity = n.severity || 40;
|
this.severity = n.severity || 40;
|
||||||
this.active = (n.active === null || typeof n.active === "undefined") || n.active;
|
this.active = (n.active === null || typeof n.active === "undefined") || n.active;
|
||||||
if (this.tostatus) {
|
if (this.tostatus) { this.status({fill:"grey", shape:"ring"}); }
|
||||||
this.oldStatus = {fill:"grey", shape:"ring"};
|
|
||||||
this.status(this.oldStatus);
|
|
||||||
}
|
|
||||||
else { this.status({}); }
|
else { this.status({}); }
|
||||||
|
|
||||||
var node = this;
|
var node = this;
|
||||||
@ -78,16 +75,16 @@ module.exports = function(RED) {
|
|||||||
node.log(util.inspect(output, {colors:useColors}));
|
node.log(util.inspect(output, {colors:useColors}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (this.tostatus === true) {
|
||||||
|
var st = util.inspect(output);
|
||||||
|
var severity = node.severity;
|
||||||
|
if (st.length > 32) { st = st.substr(0,32) + "..."; }
|
||||||
|
node.status({fill:colors[severity], shape:"dot", text:st});
|
||||||
|
}
|
||||||
if (this.active) {
|
if (this.active) {
|
||||||
if (this.tosidebar == true) {
|
if (this.tosidebar == true) {
|
||||||
sendDebug({id:node.id, z:node.z, name:node.name, topic:msg.topic, property:property, msg:output, _path:msg._path});
|
sendDebug({id:node.id, z:node.z, name:node.name, topic:msg.topic, property:property, msg:output, _path:msg._path});
|
||||||
}
|
}
|
||||||
if (this.tostatus === true) {
|
|
||||||
var st = util.inspect(output);
|
|
||||||
if (st.length > 32) { st = st.substr(0,32) + "..."; }
|
|
||||||
node.oldStatus = {fill:colors[node.severity], shape:"dot", text:st};
|
|
||||||
node.status(node.oldStatus);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user