Skip to content

Commit 747f278

Browse files
committed
Merge branch 'c960657-email-backtracking'
2 parents 3ba7197 + c3d6d84 commit 747f278

19 files changed

+4042
-27
lines changed

dist/Autolinker.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* Autolinker.js
3-
* 1.4.4
3+
* 1.5.0
44
*
55
* Copyright(c) 2017 Gregory Jacobs <greg@greg-jacobs.com>
66
* MIT License
@@ -240,7 +240,7 @@ Autolinker.parse = function( textOrHtml, options ) {
240240
*
241241
* Ex: 0.25.1
242242
*/
243-
Autolinker.version = '1.4.4';
243+
Autolinker.version = '1.5.0';
244244

245245

246246
Autolinker.prototype = {
@@ -3215,7 +3215,7 @@ Autolinker.matcher.Email = Autolinker.Util.extend( Autolinker.matcher.Matcher, {
32153215
restrictedSpecialCharacters = '\\s"(),:;<>@\\[\\]',
32163216
validCharacters = alphaNumericChars + specialCharacters,
32173217
validRestrictedCharacters = validCharacters + restrictedSpecialCharacters,
3218-
emailRegex = new RegExp( '(?:(?:[' + validCharacters + '](?![^@]*\\.\\.)(?:[' + validCharacters + '.]*[' + validCharacters + '])?)|(?:\\"[' + validRestrictedCharacters + '.]+\\"))@'),
3218+
emailRegex = new RegExp( '(?:[' + validCharacters + '](?:[' + validCharacters + ']|\\.(?!\\.|@))*|\\"[' + validRestrictedCharacters + '.]+\\")@'),
32193219
domainNameRegex = Autolinker.RegexLib.domainNameRegex,
32203220
tldRegex = Autolinker.tldRegex; // match our known top level domains (TLDs)
32213221

dist/Autolinker.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/api/data-b1cba292aac630ea4a3da8e7d4445f33.js renamed to docs/api/data-0cfafcc469bd1e77c3fc920bb1640cdf.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/api/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title>Autolinker v1.4.4 API Docs</title>
4+
<title>Autolinker v1.5.0 API Docs</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<meta http-equiv="X-UA-Compatible" content="chrome=1">
77
<meta name="fragment" content="!">
@@ -10,10 +10,10 @@
1010

1111
<link rel="shortcut icon" type="image/ico" href="favicon.ico" />
1212
<link rel="stylesheet" href="resources/css/app-4689d2a5522dcd3c9e9923ca59c33f27.css" type="text/css" />
13-
<link rel="stylesheet" href="styles-8184dad50dadb76aad743829a7c19ed0.css" type="text/css" />
13+
<link rel="stylesheet" href="styles-3eba09980fa05ead185cb17d9c0deb0f.css" type="text/css" />
1414

1515
<script type="text/javascript" src="extjs/ext-all.js"></script>
16-
<script type="text/javascript" src="data-b1cba292aac630ea4a3da8e7d4445f33.js"></script>
16+
<script type="text/javascript" src="data-0cfafcc469bd1e77c3fc920bb1640cdf.js"></script>
1717

1818
<script type="text/javascript" src="app-0c945a27f43452df695771ddb60b3d14.js"></script>
1919

@@ -22,9 +22,9 @@
2222
</head>
2323
<body id="ext-body">
2424

25-
<div id="loading"><span class="title">Autolinker v1.4.4 API Docs</span><span class="logo"></span></div>
25+
<div id="loading"><span class="title">Autolinker v1.5.0 API Docs</span><span class="logo"></span></div>
2626

27-
<div id="header-content">Autolinker v1.4.4 API Docs</div>
27+
<div id="header-content">Autolinker v1.5.0 API Docs</div>
2828

2929
<div id='categories-content' style='display:none'>
3030
<div class='section'>
@@ -82,7 +82,7 @@ <h3>Others...</h3>
8282

8383

8484

85-
<div id='footer-content' style='display: none'>Generated on Tue 12 Sep 2017 09:46:17 by <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> 5.3.4.</div>
85+
<div id='footer-content' style='display: none'>Generated on Mon 06 Nov 2017 21:26:57 by <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> 5.3.4.</div>
8686

8787

8888

docs/api/output/Autolinker.matcher.Email.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)