diff options
author | ふぁぼ原 <ko_kurihara@yahoo.co.jp> | 2017-09-16 22:01:15 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-16 15:01:15 +0200 |
commit | 629fae8b3be3a04d5190a9048f0aa5a15bd17828 (patch) | |
tree | 769255836540bdec6c2ab53303bbee9fee9703f4 /app/javascript/mastodon/features/compose/util/counter.js | |
parent | c30e6433de905c167f2920ced6b6bd659cf617eb (diff) |
correct URL pattern used in text length counter in WebUI (#4968)
Diffstat (limited to 'app/javascript/mastodon/features/compose/util/counter.js')
-rw-r--r-- | app/javascript/mastodon/features/compose/util/counter.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/util/counter.js b/app/javascript/mastodon/features/compose/util/counter.js index f0fea1a0e..588a372c6 100644 --- a/app/javascript/mastodon/features/compose/util/counter.js +++ b/app/javascript/mastodon/features/compose/util/counter.js @@ -1,7 +1,9 @@ +import { urlRegex } from './url_regex'; + const urlPlaceholder = 'xxxxxxxxxxxxxxxxxxxxxxx'; export function countableText(inputText) { return inputText - .replace(/https?:\/\/\S+/g, urlPlaceholder) + .replace(urlRegex, urlPlaceholder) .replace(/(?:^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+)/ig, '@$2'); }; |