frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr_1197' into 0.17

Browse Source
This commit is contained in:
Nick O'Leary
2017-04-10 15:25:19 +01:00
parent 1c11e7f97b 38a950a6dc
commit 83ca8147ca
5 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/js/ui/tab-info.js
View File

@@ -215,10 +215,13 @@ RED.sidebar.info = (function() {
var infoText = "";
if (!subflowNode && node.type != "comment") {
if (!subflowNode && node.type !== "comment" && node.type !== "tab") {
var helpText = $("script[data-help-name='"+node.type+"']").html()||"";
infoText = helpText;
} else if (node.type === "tab") {
infoText = marked(node.info||"");
}
if (subflowNode) {
infoText = infoText + marked(subflowNode.info||"");
} else if (node._def && node._def.info) {
@@ -365,7 +368,12 @@ RED.sidebar.info = (function() {
if (flow) {
refresh(flow);
} else {
clear();
var workspace = RED.nodes.workspace(RED.workspaces.active());
if (workspace.info) {
refresh(workspace);
} else {
clear();
}
}
}
});