Rollback reorder call methods and add equal subsequence exception in 'compactMatches' method

Author: 김부승

dist/Autolinker.js

@@ -630,17 +630,18 @@ Autolinker.prototype = {
 			}
 		}
 
-		// After we have found all matches, remove matches for match types that have been turned
-		// off. We needed to have all match types turned on initially so that
-		// things like hashtags could be filtered out if they were really just
-		// part of a URL match (for instance, as a named anchor).
-		matches = this.removeUnwantedMatches( matches );
 
-		// And finally, remove subsequent matches that
+		// After we have found all matches, remove subsequent matches that
 		// overlap with a previous match. This can happen for instance with URLs,
 		// where the url 'google.com/#link' would match '#link' as a hashtag.
 		matches = this.compactMatches( matches );
 
+		// And finally, remove matches for match types that have been turned
+		// off. We needed to have all match types turned on initially so that
+		// things like hashtags could be filtered out if they were really just
+		// part of a URL match (for instance, as a named anchor).
+		matches = this.removeUnwantedMatches( matches );
+
 		return matches;
 	},
 
@@ -660,11 +661,22 @@ Autolinker.prototype = {
 
 		for( var i = 0; i < matches.length - 1; i++ ) {
 			var match = matches[ i ],
-			    endIdx = match.getOffset() + match.getMatchedText().length;
+					offset = match.getOffset(),
+					matchedTextLength = match.getMatchedText().length,
+			    endIdx = offset + matchedTextLength;
+
+			if( i + 1 < matches.length ) {
+				// Remove subsequent matches that equal offset with current match
+				if( matches[ i + 1 ].getOffset() === offset ) {
+					var removeIdx = matches[ i + 1 ].getMatchedText().length > matchedTextLength ? i : i + 1;
+					matches.splice( removeIdx, 1 );
+					continue;
+				}
 
-			// Remove subsequent matches that overlap with the current match
-			while( i + 1 < matches.length && matches[ i + 1 ].getOffset() <= endIdx ) {
-				matches.splice( i + 1, 1 );
+				// Remove subsequent matches that overlap with the current match
+				if( matches[ i + 1 ].getOffset() <= endIdx ) {
+					matches.splice( i + 1, 1 );
+				}
 			}
 		}
 

dist/Autolinker.min.js

@@ -13,7 +13,7 @@
   <link rel="stylesheet" href="styles-3eba09980fa05ead185cb17d9c0deb0f.css" type="text/css" />
 
   <script type="text/javascript" src="extjs/ext-all.js"></script>
-  <script type="text/javascript" src="data-1df28a367878e4e8fc26f668c464fdb1.js"></script>
+  <script type="text/javascript" src="data-97897bf9ffc99e3f2efe9ad3da7e2b84.js"></script>
 
   <script type="text/javascript" src="app-0c945a27f43452df695771ddb60b3d14.js"></script>
 
@@ -82,7 +82,7 @@ <h3>Others...</h3>
 
 
 
-  <div id='footer-content' style='display: none'>Generated on Thu 02 Mar 2017 22:30:00 by <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> 5.3.4.</div>
+  <div id='footer-content' style='display: none'>Generated on Thu 06 Apr 2017 12:37:56 by <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> 5.3.4.</div>