summaryrefslogtreecommitdiffstats
path: root/webapp/components/suggestion/at_mention_provider.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-12-06 07:36:40 -0500
committerenahum <nahumhbl@gmail.com>2016-12-06 09:36:40 -0300
commitb477e384d86e9233aed55448598352d2c42a1525 (patch)
tree4ccb6bf77d140700c842c8999c8fdf70de244758 /webapp/components/suggestion/at_mention_provider.jsx
parent01015dd30ef74cf4b3080cd5f9ff5c5cf9df39d2 (diff)
downloadchat-b477e384d86e9233aed55448598352d2c42a1525.tar.gz
chat-b477e384d86e9233aed55448598352d2c42a1525.tar.bz2
chat-b477e384d86e9233aed55448598352d2c42a1525.zip
Added support for autocompleting at mentions for users with non-alphanumeric names (#4717)
Diffstat (limited to 'webapp/components/suggestion/at_mention_provider.jsx')
-rw-r--r--webapp/components/suggestion/at_mention_provider.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx
index 6118b8d98..f1b36d697 100644
--- a/webapp/components/suggestion/at_mention_provider.jsx
+++ b/webapp/components/suggestion/at_mention_provider.jsx
@@ -15,6 +15,7 @@ import {Constants, ActionTypes} from 'utils/constants.jsx';
import React from 'react';
import {FormattedMessage} from 'react-intl';
+import XRegExp from 'xregexp';
class AtMentionSuggestion extends Suggestion {
render() {
@@ -124,7 +125,7 @@ export default class AtMentionProvider {
handlePretextChanged(suggestionId, pretext) {
const hadSuggestions = this.clearTimeout(this.timeoutId);
- const captured = (/(?:^|\W)@([a-z0-9\-._]*)$/i).exec(pretext.toLowerCase());
+ const captured = XRegExp.cache('(?:^|\\W)@([\\pL\\d\\-_.]*)$', 'i').exec(pretext.toLowerCase());
if (captured) {
const prefix = captured[1];