From aba830ff8c54746ae1855afa67d6083d9fed7a47 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Wed, 25 Jan 2012 12:48:12 +0000
Subject: [PATCH] Refactored story navigator to work by modifying the story
 tiddlers

Currently hardwiring the name of the tiddler containing the story
---
 js/App.js            |  2 +-
 js/StoryNavigator.js | 13 ++++++++-----
 js/Tiddler.js        |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/js/App.js b/js/App.js
index a39193f85..6c9271cdc 100644
--- a/js/App.js
+++ b/js/App.js
@@ -116,7 +116,7 @@ var App = function() {
 		window.setInterval(function() {
 			me.store.addTiddler(new Tiddler({
 				title: "TiddlyWiki5",
-				text: "This tiddler is new"
+				text: "This tiddler is new at " + (new Date()).toString()
 			}));
 		},3000);
 		// Register an event handler to handle refreshing the DOM
diff --git a/js/StoryNavigator.js b/js/StoryNavigator.js
index 62bcbb961..913503dc6 100644
--- a/js/StoryNavigator.js
+++ b/js/StoryNavigator.js
@@ -9,17 +9,20 @@ This browser component manages navigating to new tiddlers in a TiddlyWiki classi
 /*jslint node: true, jquery: true */
 "use strict";
 
+var Tiddler = require("./Tiddler.js").Tiddler;
+
 var StoryNavigator = function(navigators) {
 	this.navigators = navigators;
 };
 
 StoryNavigator.prototype.navigateTo = function(title) {
-	var tiddlerHtml = this.navigators.store.tiddlerExists(title) && this.navigators.store.renderTiddler("text/html","SimpleTemplate",title);
-	if(tiddlerHtml) {
-		var article = $("<article/>").html(tiddlerHtml);
-		article.appendTo("body");
+	var store = this.navigators.store,
+		tiddler = store.getTiddler(title),
+		storyTiddler = store.getTiddler("StoryTiddlers");
+	if(tiddler) {
+		store.addTiddler(new Tiddler(storyTiddler,{text: title + "\n" + storyTiddler.text}));
 		$("html,body").animate({
-			scrollTop: article.offset().top
+			scrollTop: 0
 		}, 400);
 		return false;
 	} else {
diff --git a/js/Tiddler.js b/js/Tiddler.js
index d2727dce6..b2d20e115 100755
--- a/js/Tiddler.js
+++ b/js/Tiddler.js
@@ -29,7 +29,7 @@ var Tiddler = function(/* tiddler,fields */) {
 		arg = arguments[c];
 		src = null;
 		if(arg instanceof Tiddler) {
-			src = arg.fields;
+			src = arg.getFields();
 		} else {
 			src = arg;
 		}