summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2018-08-23 15:25:31 +0200
committerGitHub <noreply@github.com>2018-08-23 15:25:31 +0200
commit8a8eb605b4247fcfea3487bd24ed2cf61bde1872 (patch)
tree7f459c03c40dc0169f044f30906a43d3711242ab
parent893cccba68416bc4a68fa9e0afacbc8d5aa6e288 (diff)
parentcd5bc9b89345cdb1e70998a66a5210724e3de477 (diff)
downloadnextcloud-server-8a8eb605b4247fcfea3487bd24ed2cf61bde1872.tar.gz
nextcloud-server-8a8eb605b4247fcfea3487bd24ed2cf61bde1872.zip
Merge pull request #10821 from nextcloud/backport/10471/improve-url-detection
[stable13] Improve URL detection
-rw-r--r--core/js/public/comments.js2
-rw-r--r--core/js/tests/specs/public/commentsSpec.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/core/js/public/comments.js b/core/js/public/comments.js
index 9811528e4c1..f4825f08642 100644
--- a/core/js/public/comments.js
+++ b/core/js/public/comments.js
@@ -21,7 +21,7 @@
* The downside: anything not ascii is excluded. Not sure how common it is in areas using different
* alphabets… the upside: fake domains with similar looking characters won't be formatted as links
*/
- urlRegex: /(\s|^)(https?:\/\/)?((?:[-A-Z0-9+_]*\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|$)/ig,
+ urlRegex: /(\s|^)(https?:\/\/)?((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|$)/ig,
plainToRich: function(content) {
content = this.formatLinksRich(content);
diff --git a/core/js/tests/specs/public/commentsSpec.js b/core/js/tests/specs/public/commentsSpec.js
index 57fd7264d25..77b00369cab 100644
--- a/core/js/tests/specs/public/commentsSpec.js
+++ b/core/js/tests/specs/public/commentsSpec.js
@@ -38,6 +38,7 @@ describe('OCP.Comments tests', function() {
{input: 'hi noreply@nextcloud.com', expected: 'hi noreply@nextcloud.com'},
{input: 'hi <noreply@nextcloud.com>', expected: 'hi <noreply@nextcloud.com>'},
{input: 'FirebaseInstanceId.getInstance().deleteInstanceId()', expected: 'FirebaseInstanceId.getInstance().deleteInstanceId()'},
+ {input: 'I mean...it', expected: 'I mean...it'},
];
}