mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-06-26 15:12:52 +00:00
Code Issues Releases Wiki Activity

Better error messages in the view and tiddler macros

Browse Source
This commit is contained in:
Jeremy Ruston 2012-03-03 18:35:52 +00:00
parent 7f136dd898
commit 2ecb1f670c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/macros/tiddler.js
View File

@ -84,7 +84,7 @@ exports.macro = {
content = parseTree ? parseTree.tree : []; content = parseTree ? parseTree.tree : [];
} }
} else { } else {
content = [Renderer.TextNode("{{** Tiddler recursion error in <<tiddler>> macro **}}")]; content = [Renderer.ErrorNode("Tiddler recursion error in <<tiddler>> macro")];
} }
parents.push(renderTemplate); parents.push(renderTemplate);
for(t=0; t<content.length; t++) { for(t=0; t<content.length; t++) {

4
js/macros/view.js
View File

@ -21,7 +21,7 @@ exports.macro = {
}, },
execute: function() { execute: function() {
if(!this.tiddlerTitle) { if(!this.tiddlerTitle) {
return Renderer.TextNode("{{** Missing tiddler **}}"); return Renderer.ErrorNode("Missing tiddler");
} else { } else {
var tiddler = this.store.getTiddler(this.tiddlerTitle), var tiddler = this.store.getTiddler(this.tiddlerTitle),
v = tiddler[this.params.field], v = tiddler[this.params.field],
@ -43,7 +43,7 @@ exports.macro = {
if(parents.indexOf(tiddler.title) === -1) { if(parents.indexOf(tiddler.title) === -1) {
content = this.store.parseTiddler(tiddler.title).tree; content = this.store.parseTiddler(tiddler.title).tree;
} else { } else {
content = [Renderer.TextNode("{{** Tiddler recursion error in <<view>> macro **}}")]; content = [Renderer.ErrorNode("Tiddler recursion error in <<view>> macro")];
} }
parents = parents.slice(0); parents = parents.slice(0);
parents.push(tiddler.title); parents.push(tiddler.title);