From e5ba101ebe1f45643d22df2aa8c71a1f05785806 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Mon, 11 Jun 2012 17:36:28 +0100 Subject: [PATCH] Fixed problem with view macro generating null content Avoids errors better to generate empty content --- core/modules/macros/view.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/modules/macros/view.js b/core/modules/macros/view.js index 26aba521c..4736d3483 100644 --- a/core/modules/macros/view.js +++ b/core/modules/macros/view.js @@ -52,7 +52,7 @@ exports.executeMacro = function() { switch(this.params.format) { case "link": if(value === undefined) { - return null; + return $tw.Tree.Text(""); } else { var link = $tw.Tree.Macro("link",{ srcParams: {to: value}, @@ -86,7 +86,7 @@ exports.executeMacro = function() { case "date": var template = this.params.template || "DD MMM YYYY"; if(value === undefined) { - return null; + return $tw.Tree.Text(""); } else { return $tw.Tree.Text($tw.utils.formatDateString(value,template)); } @@ -97,12 +97,12 @@ exports.executeMacro = function() { value = tiddler.getFieldString(field); } if(value === undefined || value === null) { - return null; + return $tw.Tree.Text(""); } else { return $tw.Tree.Text(value); } } - return null; + return $tw.Tree.Text(""); }; })();