From 75e6bdef2b9b246f6bddbbf58aa1a0103ef07138 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Tue, 3 Jan 2012 11:57:30 +0000
Subject: [PATCH] Changed App.js to be a proper object class

---
 js/App.js                 | 125 ++++++++++++++++++++------------------
 tiddlywiki5/BootLoader.js |   2 +-
 2 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/js/App.js b/js/App.js
index d03777429..caccdefb4 100644
--- a/js/App.js
+++ b/js/App.js
@@ -18,66 +18,71 @@ var WikiStore = require("./WikiStore.js").WikiStore,
 	Navigators = require("./Navigators.js").Navigators,
 	StoryNavigator = require("./StoryNavigator.js").StoryNavigator;
 
-var store = new WikiStore(),
-	t;
-
-// Register the wikitext processor
-store.registerTextProcessor("text/x-tiddlywiki",new WikiTextProcessor({
-	store: store
-}));
-
-// Register the standard tiddler serializers and deserializers
-tiddlerInput.register(store);
-tiddlerOutput.register(store);
-
-// Add the shadow tiddlers that are built into TiddlyWiki
-var shadowShadowStore = new WikiStore({
-		shadowStore: null
-	}),
-	shadowShadows = [
-		{title: "StyleSheet", text: ""},
-		{title: "MarkupPreHead", text: ""},
-		{title: "MarkupPostHead", text: ""},
-		{title: "MarkupPreBody", text: ""},
-		{title: "MarkupPostBody", text: ""},
-		{title: "WindowTitle", text: "<<tiddler SiteTitle>> - <<tiddler SiteSubtitle>>"},
-		{title: "DefaultTiddlers", text: "[[GettingStarted]]"},
-		{title: "MainMenu", text: "[[GettingStarted]]"},
-		{title: "SiteTitle", text: "My TiddlyWiki"},
-		{title: "SiteSubtitle", text: "a reusable non-linear personal web notebook"},
-		{title: "SiteUrl", text: ""}
-	];
-store.shadows.shadows = shadowShadowStore;
-for(t=0; t<shadowShadows.length; t++) {
-	shadowShadowStore.addTiddler(new Tiddler(shadowShadows[t]));
-}
-
-// Load the tiddlers built into the TiddlyWiki document
-var storeArea = document.getElementById("storeArea"),
-	tiddlers = store.deserializeTiddlers("(DOM)",storeArea);
-for(t=0; t<tiddlers.length; t++) {
-	store.addTiddler(new Tiddler(tiddlers[t]));
-}
-
-// Set up the sandbox for evaluated macro parameters
-store.sandbox = new Sandbox(store.getTiddlerText("javascript.pegjs"));
-
-// Install the standard navigators
-var navigators = new Navigators({
-		document: document,
-		store: store
-	});
-
-navigators.registerNavigator("StoryNavigator",new StoryNavigator(navigators));
-// Use the story navigator for all links
-navigators.install("a","StoryNavigator");
-
-store.installMacros();
-
-//console.log(JSON.stringify(store.sandbox.parse("store.classesForLink(\"HelloThere\");")));
-
-// Navigate to HelloThere
-navigators.navigateTo("HelloThere","StoryNavigator");
+var App = function() {
+	var t;
+	// Check if we're running on the server or the client
+	this.isBrowser = typeof window !== "undefined";
+	// Create the main store
+	this.store = new WikiStore();	
+	// Register the wikitext processor
+	this.store.registerTextProcessor("text/x-tiddlywiki",new WikiTextProcessor({
+		store: this.store
+	}));
+	// Register the standard tiddler serializers and deserializers
+	tiddlerInput.register(this.store);
+	tiddlerOutput.register(this.store);
+	// Add the shadow tiddlers that are built into TiddlyWiki
+	var shadowShadowStore = new WikiStore({
+			shadowStore: null
+		}),
+		shadowShadows = [
+			{title: "StyleSheet", text: ""},
+			{title: "MarkupPreHead", text: ""},
+			{title: "MarkupPostHead", text: ""},
+			{title: "MarkupPreBody", text: ""},
+			{title: "MarkupPostBody", text: ""},
+			{title: "WindowTitle", text: "<<tiddler SiteTitle>> - <<tiddler SiteSubtitle>>"},
+			{title: "DefaultTiddlers", text: "[[GettingStarted]]"},
+			{title: "MainMenu", text: "[[GettingStarted]]"},
+			{title: "SiteTitle", text: "My TiddlyWiki"},
+			{title: "SiteSubtitle", text: "a reusable non-linear personal web notebook"},
+			{title: "SiteUrl", text: ""}
+		];
+	this.store.shadows.shadows = shadowShadowStore;
+	for(t=0; t<shadowShadows.length; t++) {
+		shadowShadowStore.addTiddler(new Tiddler(shadowShadows[t]));
+	}
+	// If in the browser, load the tiddlers built into the TiddlyWiki document
+	if(this.isBrowser) {
+		var storeArea = document.getElementById("storeArea"),
+			tiddlers = this.store.deserializeTiddlers("(DOM)",storeArea);
+		for(t=0; t<tiddlers.length; t++) {
+			this.store.addTiddler(new Tiddler(tiddlers[t]));
+		}
+	}
+	// Set up the sandbox for JavaScript parsing
+	if(this.isBrowser) {
+		this.store.sandbox = new Sandbox(this.store.getTiddlerText("javascript.pegjs"));
+	} else {
+		this.store.sandbox = new Sandbox(require("fs").readFileSync("parsers/javascript.pegjs","utf8"));
+	}
+	// Hack to install standard macros
+	this.store.installMacros();
+	// Set up navigation if we're in the browser
+	if(this.isBrowser) {
+		// Install the standard navigators
+		var navigators = new Navigators({
+				document: document,
+				store: this.store
+			});
+		navigators.registerNavigator("StoryNavigator",new StoryNavigator(navigators));
+		// Use the story navigator for all links
+		navigators.install("a","StoryNavigator");
+		// Navigate to HelloThere
+		navigators.navigateTo("HelloThere","StoryNavigator");
+	}
+};
 
+exports.App = App;
 
 })();
diff --git a/tiddlywiki5/BootLoader.js b/tiddlywiki5/BootLoader.js
index 21dbe51d1..4f305a40c 100644
--- a/tiddlywiki5/BootLoader.js
+++ b/tiddlywiki5/BootLoader.js
@@ -62,7 +62,7 @@ function executeModule(modName,modRoot) {
 
 $(function() {
 	// Execute the main module
-	executeModule("js/App.js");
+	var app = new (executeModule("js/App.js").App)();
 })
 
 })();
\ No newline at end of file