From 96a9bbe5249918a70ac6f1fadbbd8efdaca31527 Mon Sep 17 00:00:00 2001
From: fjenett <fjenett@gmail.com>
Date: Sat, 7 Apr 2012 20:22:32 +0000
Subject: [PATCH] additional improvement to loading keywords in js mode to make
 extending it easier (think coffeescript mode)

---
 app/src/processing/mode/javascript/JavaScriptMode.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/processing/mode/javascript/JavaScriptMode.java b/app/src/processing/mode/javascript/JavaScriptMode.java
index e56a1576d..787545843 100644
--- a/app/src/processing/mode/javascript/JavaScriptMode.java
+++ b/app/src/processing/mode/javascript/JavaScriptMode.java
@@ -27,7 +27,7 @@ public class JavaScriptMode extends Mode
 	public boolean showSizeWarning = true;
 	
 	private JavaScriptEditor jsEditor;
-	private File javaModeFolder;
+	private File javaModeFolder, jsModeFolder;
 	
 	/**
 	 *	Constructor
@@ -40,6 +40,7 @@ public class JavaScriptMode extends Mode
 		super(base, folder);
 		
 		javaModeFolder = base.getContentFile( "modes/java" );
+		jsModeFolder = base.getContentFile( "modes/javascript" );
  	  	
 		try {
 			loadKeywords();
@@ -76,7 +77,7 @@ public class JavaScriptMode extends Mode
 	{
 		File[] files = new File[]{
 			new File( javaModeFolder, "keywords.txt" ),
-			new File( folder, "keywords.txt" )
+			new File( jsModeFolder, "keywords.txt" )
 		};
 
 		tokenMarker = new PdeKeywords();