From 67b4c86c981567b7f15667b66da21e8d9c795232 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Fri, 8 Jun 2012 11:48:46 +0100
Subject: [PATCH] Refactored file layout for JavaScript parser

---
 .../javascriptparser/esprima/tiddlywiki.plugin    | 12 ++++++++++++
 .../parsers/javascriptparser/javascriptparser.js  |  2 +-
 .../parsers/javascriptparser/tiddlywiki.plugin    | 15 ---------------
 3 files changed, 13 insertions(+), 16 deletions(-)
 create mode 100644 core/modules/parsers/javascriptparser/esprima/tiddlywiki.plugin
 delete mode 100644 core/modules/parsers/javascriptparser/tiddlywiki.plugin

diff --git a/core/modules/parsers/javascriptparser/esprima/tiddlywiki.plugin b/core/modules/parsers/javascriptparser/esprima/tiddlywiki.plugin
new file mode 100644
index 000000000..946f63edc
--- /dev/null
+++ b/core/modules/parsers/javascriptparser/esprima/tiddlywiki.plugin
@@ -0,0 +1,12 @@
+{
+	"tiddlers": [
+		{
+			"file": "../../../../../node_modules/esprima/esprima.js", 
+			"fields": {
+				"title": "$:/core/modules/parsers/javascriptparser/esprima/esprima.js",
+				"type": "application/javascript",
+				"module-type": "library"
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/core/modules/parsers/javascriptparser/javascriptparser.js b/core/modules/parsers/javascriptparser/javascriptparser.js
index c73539874..89724711e 100644
--- a/core/modules/parsers/javascriptparser/javascriptparser.js
+++ b/core/modules/parsers/javascriptparser/javascriptparser.js
@@ -12,7 +12,7 @@ Parses a JavaScript program into a parse tree
 /*global $tw: false */
 "use strict";
 
-var esprima = require("./esprima.js");
+var esprima = require("./esprima/esprima.js");
 
 // Initialise the parser
 var JavaScriptParser = function(options) {
diff --git a/core/modules/parsers/javascriptparser/tiddlywiki.plugin b/core/modules/parsers/javascriptparser/tiddlywiki.plugin
deleted file mode 100644
index b2b468745..000000000
--- a/core/modules/parsers/javascriptparser/tiddlywiki.plugin
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"tiddlers": [
-		{
-			"file": "../../../../node_modules/esprima/esprima.js", 
-			"fields": {
-				"title": "$:/core/modules/parsers/javascriptparser/esprima.js",
-				"type": "application/javascript",
-				"module-type": "library"
-			}
-		},
-		{
-			"file": "javascriptparser.js"
-		}
-	]
-}
\ No newline at end of file