From 2ecb1f670c393dfa68c1c8fdc9cd3797c7642a3e Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sat, 3 Mar 2012 18:35:52 +0000
Subject: [PATCH] Better error messages in the view and tiddler macros

---
 js/macros/tiddler.js | 2 +-
 js/macros/view.js    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/macros/tiddler.js b/js/macros/tiddler.js
index 99f2bea54..fe27063d8 100644
--- a/js/macros/tiddler.js
+++ b/js/macros/tiddler.js
@@ -84,7 +84,7 @@ exports.macro = {
 				content = parseTree ? parseTree.tree : [];
 			}
 		} else {
-			content = [Renderer.TextNode("{{** Tiddler recursion error in <<tiddler>> macro **}}")];	
+			content = [Renderer.ErrorNode("Tiddler recursion error in <<tiddler>> macro")];	
 		}
 		parents.push(renderTemplate);
 		for(t=0; t<content.length; t++) {
diff --git a/js/macros/view.js b/js/macros/view.js
index 294e1bd59..8d7f111fc 100644
--- a/js/macros/view.js
+++ b/js/macros/view.js
@@ -21,7 +21,7 @@ exports.macro = {
 	},
 	execute: function() {
 		if(!this.tiddlerTitle) {
-			return Renderer.TextNode("{{** Missing tiddler **}}");
+			return Renderer.ErrorNode("Missing tiddler");
 		} else {
 			var tiddler = this.store.getTiddler(this.tiddlerTitle),
 				v = tiddler[this.params.field],
@@ -43,7 +43,7 @@ exports.macro = {
 							if(parents.indexOf(tiddler.title) === -1) {
 								content = this.store.parseTiddler(tiddler.title).tree;
 							} else {
-								content = [Renderer.TextNode("{{** Tiddler recursion error in <<view>> macro **}}")];
+								content = [Renderer.ErrorNode("Tiddler recursion error in <<view>> macro")];
 							}
 							parents = parents.slice(0);
 							parents.push(tiddler.title);