From c74d60841844461e0fb7af9c0bc60e1fa6878a16 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sat, 14 Jul 2012 18:08:00 +0100
Subject: [PATCH] Removed parser switch

---
 core/boot.js                                                | 3 ---
 core/modules/parsers/newwikitextparser/newwikitextparser.js | 2 +-
 core/modules/parsers/wikitextparser/wikitextparser.js       | 2 +-
 core/modules/wiki.js                                        | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/boot.js b/core/boot.js
index 7aa21c9ef..cf2731f09 100644
--- a/core/boot.js
+++ b/core/boot.js
@@ -36,9 +36,6 @@ if(typeof(window) === "undefined" && !global.$tw) {
 	exports.$tw = $tw;
 }
 
-// Temporary switch for replacing the old wiki text parser with the new one
-$tw.useNewParser = true;
-
 // Boot information
 $tw.boot = {};
 
diff --git a/core/modules/parsers/newwikitextparser/newwikitextparser.js b/core/modules/parsers/newwikitextparser/newwikitextparser.js
index 593e23c36..fec5cb2f1 100644
--- a/core/modules/parsers/newwikitextparser/newwikitextparser.js
+++ b/core/modules/parsers/newwikitextparser/newwikitextparser.js
@@ -292,7 +292,7 @@ WikiTextParser.prototype.parse = function(type,text) {
 	});
 };
 
-exports[$tw.useNewParser ? "text/x-tiddlywiki" : "text/x-tiddlywiki-new"] = WikiTextParser;
+exports["text/x-tiddlywiki"] = WikiTextParser;
 
 exports["text/x-tiddlywiki-run"] = WikiTextParser;
 
diff --git a/core/modules/parsers/wikitextparser/wikitextparser.js b/core/modules/parsers/wikitextparser/wikitextparser.js
index bd6b471fb..950c21979 100644
--- a/core/modules/parsers/wikitextparser/wikitextparser.js
+++ b/core/modules/parsers/wikitextparser/wikitextparser.js
@@ -182,6 +182,6 @@ WikiTextParser.prototype.subWikifyTerm = function(output,terminatorRegExp) {
 	this.output = oldOutput;
 };
 
-exports[$tw.useNewParser ? "text/x-tiddlywiki-old" : "text/x-tiddlywiki"] = WikiTextParser;
+exports["text/x-tiddlywiki-old"] = WikiTextParser;
 
 })();
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 24423a9b1..b92ec8404 100644
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -357,7 +357,7 @@ exports.initParsers = function(moduleType) {
 		}
 	}
 	// Install the rules for the old wikitext parser rules
-	var wikitextparser = this.parsers[$tw.useNewParser ? "text/x-tiddlywiki-old" : "text/x-tiddlywiki"];
+	var wikitextparser = this.parsers["text/x-tiddlywiki-old"];
 	if(modules && wikitextparser) {
 		wikitextparser.installRules();
 	}