From 392e717497545353d7a89d887763db1115008e15 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Thu, 29 Mar 2012 14:30:22 +0100
Subject: [PATCH] Refactored handling of context tiddler

Now the title is passed around, rather than a reference to the tiddler.
This lets the context be a missing tiddler, enabling us to correctly
render missing tiddlers
---
 js/Renderer.js       | 18 ++++++++++--------
 js/WikiStore.js      |  4 ++--
 js/macros/chooser.js |  2 +-
 js/macros/link.js    |  2 +-
 js/macros/list.js    |  2 +-
 js/macros/slider.js  |  4 ++--
 js/macros/story.js   |  4 ++--
 js/macros/tiddler.js |  2 +-
 js/macros/view.js    | 20 +++++++++++++-------
 js/macros/zoomer.js  |  8 ++++----
 10 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/js/Renderer.js b/js/Renderer.js
index d5378facf..32674c7ce 100644
--- a/js/Renderer.js
+++ b/js/Renderer.js
@@ -207,9 +207,13 @@ MacroNode.prototype.cloneChildren = function() {
 	return childClones;
 };
 
-MacroNode.prototype.execute = function(parents,tiddler) {
+MacroNode.prototype.execute = function(parents,tiddlerTitle) {
 	// Evaluate macro parameters to get their values
 	this.params = {};
+	var tiddler = this.store.getTiddler(tiddlerTitle);
+	if(!tiddler) {
+		tiddler = {title: tiddlerTitle};
+	}
 	for(var p in this.srcParams) {
 		if(typeof this.srcParams[p] === "function") {
 			this.params[p] = this.srcParams[p](tiddler,this.store,utils);
@@ -218,7 +222,7 @@ MacroNode.prototype.execute = function(parents,tiddler) {
 		}
 	}
 	// Save the context tiddler
-	this.tiddlerTitle = tiddler ? tiddler.title : null;
+	this.tiddlerTitle = tiddlerTitle;
 	// Save a reference to the array of parents
 	this.parents = parents || [];
 	// Render the macro to get its content
@@ -261,8 +265,7 @@ MacroNode.prototype.refresh = function(changes) {
 	// Check if any of the dependencies of this macro node have changed
 	if(this.dependencies.hasChanged(changes)) {
 		// Re-execute the macro if so
-		var tiddler = this.store.getTiddler(this.tiddlerTitle);
-		this.execute(this.parents,tiddler);
+		this.execute(this.parents,this.tiddlerTitle);
 	} else {
 		// Refresh any children
 		for(t=0; t<this.content.length; t++) {
@@ -277,7 +280,6 @@ MacroNode.prototype.refreshInDom = function(changes) {
 	// Check if any of the dependencies of this macro node have changed
 	if(this.dependencies.hasChanged(changes)) {
 		// Ask the macro to rerender itself if it can
-		var tiddler = this.store.getTiddler(this.tiddlerTitle);
 		if(this.macro.refreshInDom) {
 			this.macro.refreshInDom.call(this,changes);
 		} else {
@@ -285,7 +287,7 @@ MacroNode.prototype.refreshInDom = function(changes) {
 			while(this.domNode.hasChildNodes()) {
 				this.domNode.removeChild(this.domNode.firstChild);
 			}
-			this.execute(this.parents,tiddler);
+			this.execute(this.parents,this.tiddlerTitle);
 			for(t=0; t<this.content.length; t++) {
 				this.content[t].renderInDom(this.domNode);
 			}
@@ -342,10 +344,10 @@ ElementNode.prototype.clone = function() {
 	return new ElementNode(this.type,this.attributes,childClones);
 };
 
-ElementNode.prototype.execute = function(parents,tiddler) {
+ElementNode.prototype.execute = function(parents,tiddlerTitle) {
 	if(this.children) {
 		for(var t=0; t<this.children.length; t++) {
-			this.children[t].execute(parents,tiddler);
+			this.children[t].execute(parents,tiddlerTitle);
 		}
 	}
 };
diff --git a/js/WikiStore.js b/js/WikiStore.js
index 853bcac8b..d4d7ffd6f 100755
--- a/js/WikiStore.js
+++ b/js/WikiStore.js
@@ -303,7 +303,7 @@ WikiStore.prototype.renderTiddler = function(targetType,tiddlerTitle,templateTit
 						null,
 						this);
 	// Execute the macro
-	macro.execute([],this.getTiddler(tiddlerTitle));
+	macro.execute([],tiddlerTitle);
 	// Render it
 	return macro.render(targetType);
 };
@@ -314,7 +314,7 @@ WikiStore.prototype.installMacro = function(macro) {
 
 WikiStore.prototype.renderMacro = function(macroName,params,children,tiddlerTitle) {
 	var macro = Renderer.MacroNode(macroName,params,children,this);
-	macro.execute([],this.getTiddler(tiddlerTitle));
+	macro.execute([],tiddlerTitle);
 	return macro;
 };
 
diff --git a/js/macros/chooser.js b/js/macros/chooser.js
index 1bc72664e..5d675b17b 100644
--- a/js/macros/chooser.js
+++ b/js/macros/chooser.js
@@ -24,7 +24,7 @@ function showChooser(macroNode) {
 				]));
 		});
 		var wrapper = Renderer.ElementNode("ul",{},nodes);
-		wrapper.execute(macroNode.parents,macroNode.store.getTiddler(macroNode.tiddlerTitle));
+		wrapper.execute(macroNode.parents,macroNode.tiddlerTitle);
 		macroNode.content = [wrapper];
 		macroNode.content[0].renderInDom(macroNode.domNode);
 	}
diff --git a/js/macros/link.js b/js/macros/link.js
index aa793202c..dc18bb75b 100644
--- a/js/macros/link.js
+++ b/js/macros/link.js
@@ -54,7 +54,7 @@ exports.macro = {
 								"class": classes
 							},this.cloneChildren())];
 		for(var t=0; t<content.length; t++) {
-			content[t].execute(this.parents,this.store.getTiddler(this.tiddlerTitle));
+			content[t].execute(this.parents,this.tiddlerTitle);
 		}
 		return content;
 	}
diff --git a/js/macros/list.js b/js/macros/list.js
index 56c961eda..2318f14b2 100644
--- a/js/macros/list.js
+++ b/js/macros/list.js
@@ -66,7 +66,7 @@ exports.macro = {
 					cloneTemplate.push(templateTree[c].clone());
 				}
 				var listNode = Renderer.ElementNode("li",null,cloneTemplate);
-				listNode.execute(parents,this.store.getTiddler(tiddlers[t]));
+				listNode.execute(parents,tiddlers[t]);
 				content.push(listNode);
 			}
 			return [Renderer.ElementNode("ul",null,content)];
diff --git a/js/macros/slider.js b/js/macros/slider.js
index f75183d16..9e4fdbe6c 100644
--- a/js/macros/slider.js
+++ b/js/macros/slider.js
@@ -141,7 +141,7 @@ exports.macro = {
 				)
 			]
 		);
-		content.execute(this.parents,this.store.getTiddler(this.tiddlerTitle));
+		content.execute(this.parents,this.tiddlerTitle);
 		return [content];
 	},
 	refreshInDom: function(changes) {
@@ -156,7 +156,7 @@ exports.macro = {
 			this.content[0].domNode.removeChild(this.content[0].children[1].domNode);
 			// Get the slider content and execute it
 			this.content[0].children[1].children = getSliderContent(this);
-			this.content[0].children[1].execute(this.parents,this.store.getTiddler(this.tiddlerTitle));
+			this.content[0].children[1].execute(this.parents,this.tiddlerTitle);
 			this.content[0].children[1].renderInDom(this.content[0].domNode,null);
 			needContentRefresh = false; // Don't refresh the children if we've just created them
 		}
diff --git a/js/macros/story.js b/js/macros/story.js
index 9ac14bc28..bc137b15e 100644
--- a/js/macros/story.js
+++ b/js/macros/story.js
@@ -43,7 +43,7 @@ exports.macro = {
 										{target: story.tiddlers[t].title,template: story.tiddlers[t].template},
 										null,
 										this.store);
-			m.execute(this.parents,this.store.getTiddler(this.tiddlerTitle));
+			m.execute(this.parents,this.tiddlerTitle);
 			content.push(m);
 		}
 		return content;
@@ -76,7 +76,7 @@ exports.macro = {
 											{target: story.tiddlers[t].title,template: story.tiddlers[t].template},
 											null,
 											this.store);
-				m.execute(this.parents,this.store.getTiddler(story.tiddlers[t].title));
+				m.execute(this.parents,story.tiddlers[t].title);
 				m.renderInDom(this.domNode,this.domNode.childNodes[t]);
 				this.content.splice(t,0,m);
 			} else {
diff --git a/js/macros/tiddler.js b/js/macros/tiddler.js
index 4d25e03eb..145c041ea 100644
--- a/js/macros/tiddler.js
+++ b/js/macros/tiddler.js
@@ -95,7 +95,7 @@ exports.macro = {
 		}
 		// Execute macros within the content
 		for(t=0; t<contentClone.length; t++) {
-			contentClone[t].execute(parents,this.store.getTiddler(renderTitle));
+			contentClone[t].execute(parents,renderTitle);
 		}
 		// Return the content
 		return contentClone;
diff --git a/js/macros/view.js b/js/macros/view.js
index 00e218a24..b48dccc7a 100644
--- a/js/macros/view.js
+++ b/js/macros/view.js
@@ -47,12 +47,17 @@ exports.macro = {
 		}
 		switch(this.params.format) {
 			case "link":
-				var link = Renderer.MacroNode("link",
-											{target: value},
-											[Renderer.TextNode(value)],
-											this.store);
-				link.execute(parents,tiddler);
-				return [link];
+				if(value === undefined) {
+					return [];
+				} else {
+					var link = Renderer.MacroNode("link",
+												{target: value},
+												[Renderer.TextNode(value)],
+												this.store);
+					link.execute(parents,this.tiddlerTitle);
+					return [link];
+				}
+				break;
 			case "wikified":
 				if(tiddler && this.params.field === "text") {
 					if(parents.indexOf(tiddler.title) !== -1) {
@@ -69,7 +74,7 @@ exports.macro = {
 					contentClone.push(content[t].clone());
 				}
 				for(t=0; t<contentClone.length; t++) {
-					contentClone[t].execute(parents,tiddler);
+					contentClone[t].execute(parents,this.tiddlerTitle);
 				}
 				return contentClone;
 			case "date":
@@ -79,6 +84,7 @@ exports.macro = {
 				} else {
 					return [Renderer.TextNode(utils.formatDateString(value,template))];
 				}
+				break;
 			default: // "text"
 				return [Renderer.TextNode(value)];
 		}
diff --git a/js/macros/zoomer.js b/js/macros/zoomer.js
index 524d789b6..2b0874a6c 100644
--- a/js/macros/zoomer.js
+++ b/js/macros/zoomer.js
@@ -24,8 +24,8 @@ function stopZoomer(macroNode) {
 	macroNode.inZoomer = false;
 	window.scrollTo(0,newScrollY);
 	document.body.style.webkitTransform = "translateY(" + newScrollY * macroNode.xFactor + "px) " + 
-										  "scale(" + macroNode.scale + ") " +
-										  "translateY(" + ((macroNode.windowHeight / macroNode.scale) - macroNode.bodyHeight) * macroNode.yFactor * macroNode.xFactor + "px)";
+		"scale(" + macroNode.scale + ") " +
+		"translateY(" + ((macroNode.windowHeight / macroNode.scale) - macroNode.bodyHeight) * macroNode.yFactor * macroNode.xFactor + "px)";
 	utils.removeClass(document.body,"in-zoomer");
 	document.body.style.webkitTransform = "translateY(0) scale(1) translateY(0)";
 }
@@ -68,8 +68,8 @@ function hoverZoomer(macroNode,x,y) {
 		scale = macroNode.scale,
 		postTranslateY = ((macroNode.windowHeight / macroNode.scale) - macroNode.bodyHeight) * macroNode.yFactor * macroNode.xFactor;
 	var transform = "translateY(" + preTranslateY.toFixed(8) + "px) " + 
-										  "scale(" + scale.toFixed(8) + ") " +
-										  "translateY(" + postTranslateY.toFixed(8) + "px)";
+			"scale(" + scale.toFixed(8) + ") " +
+			"translateY(" + postTranslateY.toFixed(8) + "px)";
 	document.body.style.webkitTransform = transform;
 }