diff --git a/public/libs/showdown.js b/public/libs/showdown.js index e0dd082..a3a8b8e 100644 --- a/public/libs/showdown.js +++ b/public/libs/showdown.js @@ -195,7 +195,7 @@ this.makeHtml = function (text) { return wholeMatch; } href = wholeMatch.replace(/^http:\/\/github.com\//, "https://github.com/") - var urlreg = /(https?|ftp|mms):\/\/([A-z0-9]+[_\-]?[A-z0-9]+\.)*[A-z0-9]+\-?[A-z0-9]+\.[A-z]{2,}(\/.*)*\/?/; + var urlreg = /(https?|ftp|mms):\/\/((([A-z0-9]+[_\-]?[A-z0-9]+\.)*[A-z0-9]+\-?[A-z0-9]+\.[A-z]{2,})|(([0-9]{1,3}\.){3}[0-9]{1,3}))(\/.*)*\/?/; return "" + wholeMatch + ""; }); text = text.replace(/[a-z0-9_\-+=.]+@[a-z0-9\-]+(\.[a-z0-9-]+)+/ig, function(wholeMatch){return "" + wholeMatch + "";});