upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1297 from hmhealey/plt761

Browse source 
PLT-761 Allowed @mentions to follow any non-alphanumeric character instead of just following whitespace
This commit is contained in:
Joram Wilander 2015-11-04 12:28:23 -05:00
commit 2840c317e5
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
web/react/utils/text_formatting.jsx
View file

@ -64,22 +64,6 @@ export function doFormatText(text, options) {
return output;
}
export function doFormatEmoticons(text) {
const tokens = new Map();
let output = Emoticons.handleEmoticons(text, tokens);
output = replaceTokens(output, tokens);
return output;
}
export function doFormatMentions(text) {
const tokens = new Map();
let output = autolinkAtMentions(text, tokens);
output = replaceTokens(output, tokens);
return output;
}
export function sanitizeHtml(text) {
let output = text;
@ -182,11 +166,15 @@ function autolinkAtMentions(text, tokens) {
}
let output = text;
output = output.replace(/(^|\s)(@([a-z0-9.\-_]*))/gi, replaceAtMentionWithToken);
output = output.replace(/(^|[^a-z0-9])(@([a-z0-9.\-_]*))/gi, replaceAtMentionWithToken);
return output;
}
function escapeRegex(text) {
return text.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
}
function highlightCurrentMentions(text, tokens) {
let output = text;
@ -226,7 +214,7 @@ function highlightCurrentMentions(text, tokens) {
}
for (const mention of UserStore.getCurrentMentionKeys()) {
output = output.replace(new RegExp(`(^|\\W)(${mention})\\b`, 'gi'), replaceCurrentMentionWithToken);
output = output.replace(new RegExp(`(^|\\W)(${escapeRegex(mention)})\\b`, 'gi'), replaceCurrentMentionWithToken);
}
return output;
@ -306,7 +294,7 @@ function highlightSearchTerm(text, tokens, searchTerm) {
return prefix + alias;
}
return output.replace(new RegExp(`()(${searchTerm})`, 'gi'), replaceSearchTermWithToken);
return output.replace(new RegExp(`()(${escapeRegex(searchTerm)})`, 'gi'), replaceSearchTermWithToken);
}
function replaceTokens(text, tokens) {