diff options
| author | Andrey Nering <andrey.nering@gmail.com> | 2017-02-25 09:31:28 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-25 09:31:28 -0300 |
| commit | d4a7040c7f12a1fbf12bdc08483baf5838f1bfb9 (patch) | |
| tree | bde56a9ed4413fb2caa9b995f08e9cb1082d98e1 | |
| parent | 9ad3a0798973c8580b763b4a8b466382734bfacd (diff) | |
| parent | 817710dd477e312a30c7be7f240cef9425e781dd (diff) | |
| download | gitea-d4a7040c7f12a1fbf12bdc08483baf5838f1bfb9.tar.gz gitea-d4a7040c7f12a1fbf12bdc08483baf5838f1bfb9.zip | |
Merge pull request #1043 from andrew-boyarshin/autolink
Fix span wrapping all the things
| -rw-r--r-- | public/js/libs/autolink.js | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/public/js/libs/autolink.js b/public/js/libs/autolink.js index a5d1e3a6ef..3a9c0d4bcb 100644 --- a/public/js/libs/autolink.js +++ b/public/js/libs/autolink.js @@ -1,12 +1,15 @@ jQuery.fn.autolink = function() { - return this.find('*').contents().filter(function () { return this.nodeType === 3; }).each(function() { - var re = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+~%\/\.\w\-]*)?\??(?:[\-\+:=&;%@\.\w]*)#?(?:[\.\!\/\\\w]*))?)/g; - $(this).each(function() { - $(this).replaceWith( - $("<span />").html( - this.nodeValue.replace(re, "<a href='$1'>$1</a>") - ) - ); + var re = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+~%\/\.\w\-]*)?\??(?:[\-\+:=&;%@\.\w]*)#?(?:[\.\!\/\\\w]*))?)/g; + return this.find('*').contents() + .filter(function () { return this.nodeType === 3; }) + .each(function() { + $(this).each(function() { + if (re.test($(this).text())) + $(this).replaceWith( + $("<span />").html( + this.nodeValue.replace(re, "<a href='$1'>$1</a>") + ) + ); + }); }); - }); };
\ No newline at end of file |