Move MatchParser and MatchValidator to their own sub-directory (src/matchParser/)

Author: gregjacobs

Gruntfile.js

@@ -55,10 +55,10 @@ module.exports = function(grunt) {
 					'src/Autolinker.js',
 					'src/Util.js',
 					'src/HtmlTag.js',
-					'src/MatchParser.js',
-					'src/MatchValidator.js',
 					'src/AnchorTagBuilder.js',
 					'src/htmlParser/HtmlParser.js',
+					'src/matchParser/MatchParser.js',
+					'src/matchParser/MatchValidator.js',
 					'src/match/Match.js',
 					'src/match/Email.js',
 					'src/match/Twitter.js',

src/Autolinker.js

@@ -195,7 +195,7 @@ Autolinker.prototype = {
 
 	/**
 	 * @private
-	 * @property {Autolinker.MatchParser} matchParser
+	 * @property {Autolinker.matchParser.MatchParser} matchParser
 	 * 
 	 * The MatchParser instance used to find URL/email/Twitter matches in the text nodes of an input string passed to
 	 * {@link #link}. This is lazily instantiated in the {@link #getMatchParser} method.
@@ -305,13 +305,13 @@ Autolinker.prototype = {
 	 * Lazily instantiates and returns the {@link #matchParser} instance for this Autolinker instance.
 	 * 
 	 * @protected
-	 * @return {Autolinker.MatchParser}
+	 * @return {Autolinker.matchParser.MatchParser}
 	 */
 	getMatchParser : function() {
 		var matchParser = this.matchParser;
 
 		if( !matchParser ) {
-			matchParser = this.matchParser = new Autolinker.MatchParser( {
+			matchParser = this.matchParser = new Autolinker.matchParser.MatchParser( {
 				urls : this.urls,
 				email : this.email,
 				twitter : this.twitter,
@@ -424,4 +424,5 @@ Autolinker.link = function( textOrHtml, options ) {
 
 // Autolinker Namespaces
 Autolinker.match = {};
-Autolinker.htmlParser = {};
+Autolinker.htmlParser = {};
+Autolinker.matchParser = {};

src/MatchParser.js renamed to src/matchParser/MatchParser.js

@@ -1,7 +1,7 @@
 /*global Autolinker */
 /**
  * @private
- * @class Autolinker.MatchParser
+ * @class Autolinker.matchParser.MatchParser
  * @extends Object
  * 
  * Used by Autolinker to parse {@link #urls URLs}, {@link #emails email addresses}, and {@link #twitter Twitter handles}, 
@@ -11,7 +11,7 @@
  * first uses the {@link HtmlParser} to "walk around" HTML tags, and then the text around the HTML tags is passed into
  * the MatchParser in order to find the actual matches.
  */
-Autolinker.MatchParser = Autolinker.Util.extend( Object, {
+Autolinker.matchParser.MatchParser = Autolinker.Util.extend( Object, {
 
 	/**
 	 * @cfg {Boolean} urls

src/MatchValidator.js renamed to src/matchParser/MatchValidator.js

@@ -14,10 +14,10 @@
 	<script type="text/javascript" src="../src/Autolinker.js"></script>
 	<script type="text/javascript" src="../src/Util.js"></script>
 	<script type="text/javascript" src="../src/HtmlTag.js"></script>
-	<script type="text/javascript" src="../src/MatchParser.js"></script>
-	<script type="text/javascript" src="../src/MatchValidator.js"></script>
 	<script type="text/javascript" src="../src/AnchorTagBuilder.js"></script>
 	<script type="text/javascript" src="../src/htmlParser/HtmlParser.js"></script>
+	<script type="text/javascript" src="../src/matchParser/MatchParser.js"></script>
+	<script type="text/javascript" src="../src/matchParser/MatchValidator.js"></script>
 	<script type="text/javascript" src="../src/match/Match.js"></script>
 	<script type="text/javascript" src="../src/match/Email.js"></script>
 	<script type="text/javascript" src="../src/match/Twitter.js"></script>