mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-24 17:10:29 +00:00
Code Issues Releases Wiki Activity

Fixed problem with view macro generating null content

Browse Source 
Avoids errors better to generate empty content
This commit is contained in:
Jeremy Ruston 2012-06-11 17:36:28 +01:00
parent e3d667a3e0
commit e5ba101ebe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/modules/macros/view.js
View File

@ -52,7 +52,7 @@ exports.executeMacro = function() {
switch(this.params.format) { switch(this.params.format) {
case "link": case "link":
if(value === undefined) { if(value === undefined) {
return null; return $tw.Tree.Text("");
} else { } else {
var link = $tw.Tree.Macro("link",{ var link = $tw.Tree.Macro("link",{
srcParams: {to: value}, srcParams: {to: value},
@ -86,7 +86,7 @@ exports.executeMacro = function() {
case "date": case "date":
var template = this.params.template || "DD MMM YYYY"; var template = this.params.template || "DD MMM YYYY";
if(value === undefined) { if(value === undefined) {
return null; return $tw.Tree.Text("");
} else { } else {
return $tw.Tree.Text($tw.utils.formatDateString(value,template)); return $tw.Tree.Text($tw.utils.formatDateString(value,template));
} }
@ -97,12 +97,12 @@ exports.executeMacro = function() {
value = tiddler.getFieldString(field); value = tiddler.getFieldString(field);
} }
if(value === undefined || value === null) { if(value === undefined || value === null) {
return null; return $tw.Tree.Text("");
} else { } else {
return $tw.Tree.Text(value); return $tw.Tree.Text(value);
} }
} }
return null; return $tw.Tree.Text("");
}; };
})(); })();