IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag (#7109)

Browse Source
This commit is contained in:
George Goldberg
2017-08-07 10:10:33 +01:00
committed by Saturnino Abril
parent 9eb8d93a0d
commit f4638aecec
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/utils/markdown.jsx
View File

@@ -175,7 +175,7 @@ class MattermostMarkdownRenderer extends marked.Renderer {
if (this.formattingOptions.searchPatterns) {
for (const pattern of this.formattingOptions.searchPatterns) {
if (pattern.test(href)) {
if (pattern.pattern.test(href)) {
output += ' search-highlight';
break;
}
@@ -189,7 +189,7 @@ class MattermostMarkdownRenderer extends marked.Renderer {
if (this.formattingOptions.siteURL) {
const pattern = new RegExp('^' + TextFormatting.escapeRegex(this.formattingOptions.siteURL) + '\\/(?:signup_user_complete|[^\\/]+\\/(?:pl|channels))\\/');
internalLink = pattern.test(outHref);
internalLink = pattern.pattern.test(outHref);
}
if (internalLink) {

27
webapp/utils/text_formatting.jsx
View File

@@ -400,7 +400,10 @@ function convertSearchTermToRegex(term) {
pattern = '\\b()(' + escapeRegex(term) + ')\\b';
}
return new RegExp(pattern, 'gi');
return {
pattern: new RegExp(pattern, 'gi'),
term
};
}
export function highlightSearchTerms(text, tokens, searchPatterns) {
@@ -426,7 +429,21 @@ export function highlightSearchTerms(text, tokens, searchPatterns) {
// highlight existing tokens matching search terms
var newTokens = new Map();
for (const [alias, token] of tokens) {
if (pattern.test(token.originalText)) {
if (pattern.pattern.test(token.originalText)) {
// If it's a Hashtag, skip it unless the search term is an exact match.
let originalText = token.originalText;
if (originalText.startsWith('#')) {
originalText = originalText.substr(1);
}
let term = pattern.term;
if (term.startsWith('#')) {
term = term.substr(1);
}
if (alias.startsWith('$MM_HASHTAG') && originalText !== term) {
continue;
}
const index = tokens.size + newTokens.size;
const newAlias = `$MM_SEARCHTERM${index}`;
@@ -438,10 +455,10 @@ export function highlightSearchTerms(text, tokens, searchPatterns) {
output = output.replace(alias, newAlias);
}
// The pattern regexes are global, so calling pattern.test() above alters their
// The pattern regexes are global, so calling pattern.pattern.test() above alters their
// state. Reset lastIndex to 0 between calls to test() to ensure it returns the
// same result every time it is called with the same value of token.originalText.
pattern.lastIndex = 0;
pattern.pattern.lastIndex = 0;
}
// the new tokens are stashed in a separate map since we can't add objects to a map during iteration
@@ -449,7 +466,7 @@ export function highlightSearchTerms(text, tokens, searchPatterns) {
tokens.set(newToken[0], newToken[1]);
}
output = output.replace(pattern, replaceSearchTermWithToken);
output = output.replace(pattern.pattern, replaceSearchTermWithToken);
}
return output;