From 20b321f92854e082ae80b4550014bd632740abdd Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 26 Oct 2015 11:12:21 +0000
Subject: [PATCH] Handle null subflow info property

---
 editor/js/ui/palette.js  | 6 +++---
 editor/js/ui/tab-info.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/editor/js/ui/palette.js b/editor/js/ui/palette.js
index 1cf754973..b9bbb9898 100644
--- a/editor/js/ui/palette.js
+++ b/editor/js/ui/palette.js
@@ -203,7 +203,7 @@ RED.palette = (function() {
                 RED.view.focus();
                 var helpText;
                 if (nt.indexOf("subflow:") === 0) {
-                    helpText = marked(RED.nodes.subflow(nt.substring(8)).info) || "";
+                    helpText = marked(RED.nodes.subflow(nt.substring(8)).info||"");
                 } else {
                     helpText = $("script[data-help-name|='"+d.type+"']").html()||"";
                 }
@@ -224,7 +224,7 @@ RED.palette = (function() {
                     RED.workspaces.show(nt.substring(8));
                     e.preventDefault();
                 });
-                nodeInfo = marked(def.info);
+                nodeInfo = marked(def.info||"");
             }
             setLabel(nt,$(d),label,nodeInfo);
 
@@ -279,7 +279,7 @@ RED.palette = (function() {
             } else if (portOutput.length !== 0 && sf.out.length === 0) {
                 portOutput.remove();
             }
-            setLabel(sf.type+":"+sf.id,paletteNode,sf.name,marked(sf.info));
+            setLabel(sf.type+":"+sf.id,paletteNode,sf.name,marked(sf.info||""));
         });
     }
 
diff --git a/editor/js/ui/tab-info.js b/editor/js/ui/tab-info.js
index cce6e74f5..ddee4e26f 100644
--- a/editor/js/ui/tab-info.js
+++ b/editor/js/ui/tab-info.js
@@ -140,7 +140,7 @@ RED.sidebar.info = (function() {
             table  += '<div class="node-help">'+helpText+"</div>";
         }
         if (subflowNode) {
-            table += '<div class="node-help">'+marked(subflowNode.info)+'</div>';
+            table += '<div class="node-help">'+marked(subflowNode.info||"")+'</div>';
         } else if (node._def && node._def.info) {
             var info = node._def.info;
             table += '<div class="node-help">'+marked(typeof info === "function" ? info.call(node) : info)+'</div>';