From 2c3f96557f86d0d6de7cab93277f1604a638baf0 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Fri, 2 Dec 2011 16:13:17 +0000
Subject: [PATCH] Fixed handling of shadow tiddlers

---
 js/Recipe.js     | 20 ++++++--------------
 js/TiddlyWiki.js |  3 ++-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/js/Recipe.js b/js/Recipe.js
index 934b50e59..16b78e7f0 100755
--- a/js/Recipe.js
+++ b/js/Recipe.js
@@ -117,7 +117,8 @@ Recipe.prototype.chooseTiddlers = function(recipe) {
 		if(recipeLine instanceof Array) {
 			this.chooseTiddlers(recipeLine);
 		} else {
-			var markerArray = this.markers[recipeLine.marker];
+			var store = recipeLine.marker === "shadow" ? this.store.shadows : this.store,
+				markerArray = this.markers[recipeLine.marker];
 			if(markerArray === undefined) {
 				this.markers[recipeLine.marker] = [];
 				markerArray = this.markers[recipeLine.marker];
@@ -132,8 +133,8 @@ Recipe.prototype.chooseTiddlers = function(recipe) {
 				}
 				if(!found) {
 					markerArray.push(recipeLine.tiddlers[t].title);
-				}
-				this.store.addTiddler(new Tiddler(recipeLine.tiddlers[t]));
+				}	
+				store.addTiddler(new Tiddler(recipeLine.tiddlers[t]));
 			}
 		}		
 	}
@@ -269,19 +270,10 @@ Recipe.tiddlerOutputter = {
 		}
 	},
 	shadow: function(out,tiddlers) {
-		// Shadows are output as a <DIV> with the the ".shadow" suffix removed from the title
 		for(var t=0; t<tiddlers.length; t++) {
 			var title = tiddlers[t],
-				tid = this.store.getTiddler(title),
-				tweakedTiddler;
-			if(title.indexOf(".shadow") === title.length - 7) {
-				tweakedTiddler = new Tiddler(tid,{
-					title: title.substr(0, title.length-7)
-				});
-			} else {
-				tweakedTiddler = tid;
-			}
-			out.push(tiddlerOutput.outputTiddlerDiv(tweakedTiddler));
+				tid = this.store.shadows.getTiddler(title);
+			out.push(tiddlerOutput.outputTiddlerDiv(tid));
 		}
 	}
 };
diff --git a/js/TiddlyWiki.js b/js/TiddlyWiki.js
index d953e0ed8..a4eb19758 100755
--- a/js/TiddlyWiki.js
+++ b/js/TiddlyWiki.js
@@ -3,8 +3,9 @@
 
 var Tiddler = require("./Tiddler.js").Tiddler;
 
-var TiddlyWiki = function() {
+var TiddlyWiki = function TiddlyWiki(shadowStore) {
 	this.tiddlers = {};
+	this.shadows = shadowStore === undefined ? new TiddlyWiki(null) : shadowStore;
 };
 
 TiddlyWiki.prototype.clear = function() {