Fix for urls inside tags on the first line.

ChiperSoft · Mar 16, 2011 · 28cd3e6 · 28cd3e6
1 parent db97dce
commit 28cd3e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/showdown.js b/showdown.js
@@ -144,8 +144,8 @@ Attacklab.showdown.converter = function () {
 		text = text.replace(/~T/g, "~");
 
 		// ** GFM **  Auto-link URLs and emails
-	    text = text.replace(/https?\:\/\/[^"\s<>]*[^.,;'">\:\s<>\)\]\!]/g, function (wholeMatch, matchIndex){
-			var left = text.slice(text.lastIndexOf('\n',matchIndex), matchIndex);
+		text = text.replace(/https?\:\/\/[^"\s<>]*[^.,;'">\:\s<>\)\]\!]/g, function (wholeMatch, matchIndex){
+			var left = text.slice(Math.max(0,text.lastIndexOf('\n',matchIndex)), matchIndex);
 			var right = text.slice(matchIndex);
 			if (left.match(/<([a-z]+)\s[^>]+$/) && right.match(/^[^>]*>/)) {return wholeMatch;}
 			return "<a href='" + wholeMatch + "'>" + wholeMatch + "</a>";

diff --git a/wmd.combined.js b/wmd.combined.js
@@ -2362,8 +2362,8 @@ Attacklab.showdown.converter = function () {
 		text = text.replace(/~T/g, "~");
 
 		// ** GFM **  Auto-link URLs and emails
-	    text = text.replace(/https?\:\/\/[^"\s<>]*[^.,;'">\:\s<>\)\]\!]/g, function (wholeMatch, matchIndex){
-			var left = text.slice(text.lastIndexOf('\n',matchIndex), matchIndex);
+		text = text.replace(/https?\:\/\/[^"\s<>]*[^.,;'">\:\s<>\)\]\!]/g, function (wholeMatch, matchIndex){
+			var left = text.slice(Math.max(0,text.lastIndexOf('\n',matchIndex)), matchIndex);
 			var right = text.slice(matchIndex);
 			if (left.match(/<([a-z]+)\s[^>]+$/) && right.match(/^[^>]*>/)) {return wholeMatch;}
 			return "<a href='" + wholeMatch + "'>" + wholeMatch + "</a>";
@@ -3182,8 +3182,6 @@ Attacklab.showdown.converter = function () {
 			return m1 + "<strike>" + c + "</strike>";
 		});
 
-		console.log(text);
-
 		return text;
 	};
 

diff --git a/wmd.combined.min.js b/wmd.combined.min.js