Merge branch 'mattermost-underscore'

Author: gregjacobs

dist/Autolinker.js

@@ -2867,7 +2867,7 @@ Autolinker.matcher.Email = Autolinker.Util.extend( Autolinker.matcher.Matcher, {
 	 */
 	matcherRegex : (function() {
 		var alphaNumericChars = Autolinker.RegexLib.alphaNumericCharsStr,
-		    emailRegex = new RegExp( '[' + alphaNumericChars + '\\-;:&=+$.,]+@' ),  // something@ for email addresses (a.k.a. local-part)
+		    emailRegex = new RegExp( '[' + alphaNumericChars + '\\-\\_;:&=+$.,]+@' ),  // something@ for email addresses (a.k.a. local-part)
 			domainNameRegex = Autolinker.RegexLib.domainNameRegex,
 			tldRegex = Autolinker.RegexLib.tldRegex;  // match our known top level domains (TLDs)
 

dist/Autolinker.min.js

@@ -19,7 +19,7 @@ Autolinker.matcher.Email = Autolinker.Util.extend( Autolinker.matcher.Matcher, {
 	 */
 	matcherRegex : (function() {
 		var alphaNumericChars = Autolinker.RegexLib.alphaNumericCharsStr,
-		    emailRegex = new RegExp( '[' + alphaNumericChars + '\\-;:&=+$.,]+@' ),  // something@ for email addresses (a.k.a. local-part)
+		    emailRegex = new RegExp( '[' + alphaNumericChars + '\\-\\_;:&=+$.,]+@' ),  // something@ for email addresses (a.k.a. local-part)
 			domainNameRegex = Autolinker.RegexLib.domainNameRegex,
 			tldRegex = Autolinker.RegexLib.tldRegex;  // match our known top level domains (TLDs)
 

src/matcher/Email.js

@@ -835,6 +835,12 @@ describe( "Autolinker", function() {
 			} );
 
 
+			it( "should properly link an email address with underscopres", function() {
+				var result = autolinker.link( "Joe's email is ([email protected])" );
+				expect( result ).toBe( 'Joe\'s email is (<a href="mailto:[email protected]">[email protected]</a>)' );
+			} );
+
+
 			it( "should automatically link an email address with accented characters", function() {
 				var result = autolinker.link( "Joe's email is mañana@mañana.com" );
 				expect( result ).toBe( 'Joe\'s email is <a href="mailto:mañana@mañana.com">mañana@mañana.com</a>' );

tests/AutolinkerSpec.js

@@ -60,6 +60,14 @@ describe( "Autolinker.matcher.Email", function() {
 			MatchChecker.expectEmailMatch( matches[ 0 ], '[email protected]', 7 );
 		} );
 
+
+		it( 'a match with underscores should be parsed correctly', function() {
+			var matches = matcher.parseMatches( 'Hello [email protected]' );
+
+			expect( matches.length ).toBe( 1 );
+			MatchChecker.expectEmailMatch( matches[ 0 ], '[email protected]', 6 );
+		} );
+
 	} );