;
let flag;
let flagFunc;
diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx
index ada5e0ea6c..2260f99ad3 100644
--- a/webapp/components/search_results_item.jsx
+++ b/webapp/components/search_results_item.jsx
@@ -2,6 +2,7 @@
// See License.txt for license information.
import $ from 'jquery';
+import PostMessageContainer from 'components/post_view/components/post_message_container.jsx';
import UserProfile from './user_profile.jsx';
import TeamStore from 'stores/team_store.jsx';
@@ -11,7 +12,6 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
import * as GlobalActions from 'actions/global_actions.jsx';
import {flagPost, unflagPost} from 'actions/post_actions.jsx';
-import * as TextFormatting from 'utils/text_formatting.jsx';
import * as Utils from 'utils/utils.jsx';
import * as PostUtils from 'utils/post_utils.jsx';
@@ -78,11 +78,6 @@ export default class SearchResultsItem extends React.Component {
}
}
- const formattingOptions = {
- searchTerm: this.props.term,
- mentionHighlight: this.props.isMentionSearch
- };
-
let overrideUsername;
let disableProfilePopover = false;
if (post.props &&
@@ -251,9 +246,12 @@ export default class SearchResultsItem extends React.Component {
diff --git a/webapp/root.jsx b/webapp/root.jsx
index d5b9a6d476..0fef23a53f 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -16,6 +16,7 @@ import * as I18n from 'i18n/i18n.jsx';
import 'bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css';
import 'google-fonts/google-fonts.css';
import 'sass/styles.scss';
+import 'katex/dist/katex.min.css';
// Import the root of our routing tree
import rRoot from 'routes/route_root.jsx';
diff --git a/webapp/stores/emoji_store.jsx b/webapp/stores/emoji_store.jsx
index e369885b42..076e671dd3 100644
--- a/webapp/stores/emoji_store.jsx
+++ b/webapp/stores/emoji_store.jsx
@@ -17,6 +17,8 @@ class EmojiStore extends EventEmitter {
this.dispatchToken = AppDispatcher.register(this.handleEventPayload.bind(this));
+ this.setMaxListeners(600);
+
this.emojis = new Map(EmojiJson);
this.systemEmojis = new Map(EmojiJson);
diff --git a/webapp/stores/preference_store.jsx b/webapp/stores/preference_store.jsx
index 654036ae8f..8aecfff406 100644
--- a/webapp/stores/preference_store.jsx
+++ b/webapp/stores/preference_store.jsx
@@ -8,7 +8,7 @@ import EventEmitter from 'events';
const CHANGE_EVENT = 'change';
-class PreferenceStoreClass extends EventEmitter {
+class PreferenceStore extends EventEmitter {
constructor() {
super();
@@ -17,7 +17,7 @@ class PreferenceStoreClass extends EventEmitter {
this.preferences = new Map();
- this.setMaxListeners(20);
+ this.setMaxListeners(600);
}
getKey(category, name) {
@@ -144,7 +144,5 @@ class PreferenceStoreClass extends EventEmitter {
}
}
-const PreferenceStore = new PreferenceStoreClass();
-PreferenceStore.setMaxListeners(25);
-export default PreferenceStore;
-global.window.PreferenceStore = PreferenceStore;
+global.PreferenceStore = new PreferenceStore();
+export default global.PreferenceStore;
\ No newline at end of file
diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx
index 6a47d0f654..859f385c0e 100644
--- a/webapp/stores/user_store.jsx
+++ b/webapp/stores/user_store.jsx
@@ -334,7 +334,7 @@ class UserStoreClass extends EventEmitter {
}
var UserStore = new UserStoreClass();
-UserStore.setMaxListeners(16);
+UserStore.setMaxListeners(600);
UserStore.dispatchToken = AppDispatcher.register((payload) => {
var action = payload.action;
diff --git a/webapp/tests/formatting_links.test.jsx b/webapp/tests/formatting_links.test.jsx
new file mode 100644
index 0000000000..237ef61215
--- /dev/null
+++ b/webapp/tests/formatting_links.test.jsx
@@ -0,0 +1,504 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import assert from 'assert';
+
+import * as Markdown from 'utils/markdown.jsx';
+import * as TextFormatting from 'utils/text_formatting.jsx';
+
+describe('Markdown.Links', function() {
+ this.timeout(10000);
+
+ it('Not links', function(done) {
+ assert.equal(
+ Markdown.format('example.com').trim(),
+ 'example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('readme.md').trim(),
+ 'readme.md
'
+ );
+
+ assert.equal(
+ Markdown.format('@example.com').trim(),
+ '@example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('./make-compiled-client.sh').trim(),
+ './make-compiled-client.sh
'
+ );
+
+ assert.equal(
+ Markdown.format('test.:test').trim(),
+ 'test.:test
'
+ );
+
+ assert.equal(
+ Markdown.format('`https://example.com`').trim(),
+ '' +
+ '' +
+ '' +
+ 'https://example.com' +
+ '' +
+ '' +
+ '
'
+ );
+
+ assert.equal(
+ Markdown.format('[link](example.com').trim(),
+ '[link](example.com
'
+ );
+
+ done();
+ });
+
+ it('External links', function(done) {
+ assert.equal(
+ Markdown.format('http://example.com').trim(),
+ 'http://example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('https://example.com').trim(),
+ 'https://example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('www.example.com').trim(),
+ 'www.example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('www.example.com/index').trim(),
+ 'www.example.com/index
'
+ );
+
+ assert.equal(
+ Markdown.format('www.example.com/index.html').trim(),
+ 'www.example.com/index.html
'
+ );
+
+ assert.equal(
+ Markdown.format('www.example.com/index/sub').trim(),
+ 'www.example.com/index/sub
'
+ );
+
+ assert.equal(
+ Markdown.format('www1.example.com').trim(),
+ 'www1.example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('example.com/index').trim(),
+ 'example.com/index
'
+ );
+
+ done();
+ });
+
+ it('IP addresses', function(done) {
+ assert.equal(
+ Markdown.format('http://127.0.0.1').trim(),
+ 'http://127.0.0.1
'
+ );
+
+ assert.equal(
+ Markdown.format('http://192.168.1.1:4040').trim(),
+ 'http://192.168.1.1:4040
'
+ );
+
+ assert.equal(
+ Markdown.format('http://[::1]:80').trim(),
+ 'http://[::1]:80
'
+ );
+
+ assert.equal(
+ Markdown.format('http://[::1]:8065').trim(),
+ 'http://[::1]:8065
'
+ );
+
+ assert.equal(
+ Markdown.format('https://[::1]:80').trim(),
+ 'https://[::1]:80
'
+ );
+
+ assert.equal(
+ Markdown.format('http://[2001:0:5ef5:79fb:303a:62d5:3312:ff42]:80').trim(),
+ 'http://[2001:0:5ef5:79fb:303a:62d5:3312:ff42]:80
'
+ );
+
+ assert.equal(
+ Markdown.format('http://[2001:0:5ef5:79fb:303a:62d5:3312:ff42]:8065').trim(),
+ 'http://[2001:0:5ef5:79fb:303a:62d5:3312:ff42]:8065
'
+ );
+
+ assert.equal(
+ Markdown.format('https://[2001:0:5ef5:79fb:303a:62d5:3312:ff42]:443').trim(),
+ 'https://[2001:0:5ef5:79fb:303a:62d5:3312:ff42]:443
'
+ );
+
+ assert.equal(
+ Markdown.format('http://username:password@127.0.0.1').trim(),
+ 'http://username:password@127.0.0.1
'
+ );
+
+ assert.equal(
+ Markdown.format('http://username:password@[2001:0:5ef5:79fb:303a:62d5:3312:ff42]:80').trim(),
+ 'http://username:password@[2001:0:5ef5:79fb:303a:62d5:3312:ff42]:80
'
+ );
+
+ done();
+ });
+
+ it('Links with anchors', function(done) {
+ assert.equal(
+ Markdown.format('https://en.wikipedia.org/wiki/URLs#Syntax').trim(),
+ 'https://en.wikipedia.org/wiki/URLs#Syntax
'
+ );
+
+ assert.equal(
+ Markdown.format('https://groups.google.com/forum/#!msg').trim(),
+ 'https://groups.google.com/forum/#!msg
'
+ );
+
+ done();
+ });
+
+ it('Links with parameters', function(done) {
+ assert.equal(
+ Markdown.format('www.example.com/index?params=1').trim(),
+ 'www.example.com/index?params=1
'
+ );
+
+ assert.equal(
+ Markdown.format('www.example.com/index?params=1&other=2').trim(),
+ 'www.example.com/index?params=1&other=2
'
+ );
+
+ assert.equal(
+ Markdown.format('www.example.com/index?params=1;other=2').trim(),
+ 'www.example.com/index?params=1;other=2
'
+ );
+
+ assert.equal(
+ Markdown.format('http://example.com:8065').trim(),
+ 'http://example.com:8065
'
+ );
+
+ assert.equal(
+ Markdown.format('http://username:password@example.com').trim(),
+ 'http://username:password@example.com
'
+ );
+
+ done();
+ });
+
+ it('Special characters', function(done) {
+ assert.equal(
+ Markdown.format('http://www.example.com/_/page').trim(),
+ 'http://www.example.com/_/page
'
+ );
+
+ assert.equal(
+ Markdown.format('www.example.com/_/page').trim(),
+ 'www.example.com/_/page
'
+ );
+
+ assert.equal(
+ Markdown.format('https://en.wikipedia.org/wiki/🐬').trim(),
+ 'https://en.wikipedia.org/wiki/🐬
'
+ );
+
+ assert.equal(
+ Markdown.format('http://✪df.ws/1234').trim(),
+ 'http://✪df.ws/1234
'
+ );
+
+ done();
+ });
+
+ it('Brackets', function(done) {
+ assert.equal(
+ Markdown.format('https://en.wikipedia.org/wiki/Rendering_(computer_graphics)').trim(),
+ 'https://en.wikipedia.org/wiki/Rendering_(computer_graphics)
'
+ );
+
+ assert.equal(
+ Markdown.format('http://example.com/more_(than)_one_(parens)').trim(),
+ 'http://example.com/more_(than)_one_(parens)
'
+ );
+
+ assert.equal(
+ Markdown.format('http://example.com/(something)?after=parens').trim(),
+ 'http://example.com/(something)?after=parens
'
+ );
+
+ assert.equal(
+ Markdown.format('http://foo.com/unicode_(✪)_in_parens').trim(),
+ 'http://foo.com/unicode_(✪)_in_parens
'
+ );
+
+ done();
+ });
+
+ it('Email addresses', function(done) {
+ assert.equal(
+ Markdown.format('test@example.com').trim(),
+ 'test@example.com
'
+ );
+ assert.equal(
+ Markdown.format('test_underscore@example.com').trim(),
+ 'test_underscore@example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('mailto:test@example.com').trim(),
+ 'mailto:test@example.com
'
+ );
+
+ done();
+ });
+
+ it('Formatted links', function(done) {
+ assert.equal(
+ Markdown.format('*https://example.com*').trim(),
+ 'https://example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('_https://example.com_').trim(),
+ 'https://example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('**https://example.com**').trim(),
+ 'https://example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('__https://example.com__').trim(),
+ 'https://example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('***https://example.com***').trim(),
+ 'https://example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('___https://example.com___').trim(),
+ 'https://example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('').trim(),
+ 'https://example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('').trim(),
+ 'https://en.wikipedia.org/wiki/Rendering_(computer_graphics)
'
+ );
+
+ done();
+ });
+
+ it('Links with text', function(done) {
+ assert.equal(
+ Markdown.format('[example link](example.com)').trim(),
+ 'example link
'
+ );
+
+ assert.equal(
+ Markdown.format('[example.com](example.com)').trim(),
+ 'example.com
'
+ );
+
+ assert.equal(
+ Markdown.format('[example.com/other](example.com)').trim(),
+ 'example.com/other
'
+ );
+
+ assert.equal(
+ Markdown.format('[example.com/other_link](example.com/example)').trim(),
+ 'example.com/other_link
'
+ );
+
+ assert.equal(
+ Markdown.format('[link with spaces](example.com/ spaces in the url)').trim(),
+ 'link with spaces
'
+ );
+
+ assert.equal(
+ Markdown.format('[This whole #sentence should be a link](https://example.com)').trim(),
+ 'This whole #sentence should be a link
'
+ );
+
+ assert.equal(
+ Markdown.format('[email link](mailto:test@example.com)').trim(),
+ 'email link
'
+ );
+
+ assert.equal(
+ Markdown.format('[other link](ts3server://example.com)').trim(),
+ 'other link
'
+ );
+
+ done();
+ });
+
+ it('Links with tooltips', function(done) {
+ assert.equal(
+ Markdown.format('[link](example.com "catch phrase!")').trim(),
+ 'link
'
+ );
+
+ assert.equal(
+ Markdown.format('[link](example.com "title with "quotes"")').trim(),
+ 'link
'
+ );
+ assert.equal(
+ Markdown.format('[link with spaces](example.com/ spaces in the url "and a title")').trim(),
+ 'link with spaces
'
+ );
+
+ done();
+ });
+
+ it('Links with surrounding text', function(done) {
+ assert.equal(
+ Markdown.format('This is a sentence with a http://example.com in it.').trim(),
+ 'This is a sentence with a http://example.com in it.
'
+ );
+
+ assert.equal(
+ Markdown.format('This is a sentence with a http://example.com/_/underscore in it.').trim(),
+ 'This is a sentence with a http://example.com/_/underscore in it.
'
+ );
+
+ assert.equal(
+ Markdown.format('This is a sentence with a http://192.168.1.1:4040 in it.').trim(),
+ 'This is a sentence with a http://192.168.1.1:4040 in it.
'
+ );
+
+ assert.equal(
+ Markdown.format('This is a sentence with a https://[::1]:80 in it.').trim(),
+ 'This is a sentence with a https://[::1]:80 in it.
'
+ );
+
+ done();
+ });
+
+ it('Links with trailing punctuation', function(done) {
+ assert.equal(
+ Markdown.format('This is a link to http://example.com.').trim(),
+ 'This is a link to http://example.com.
'
+ );
+
+ assert.equal(
+ Markdown.format('This is a link containing http://example.com/something?with,commas,in,url, but not at the end').trim(),
+ 'This is a link containing http://example.com/something?with,commas,in,url, but not at the end
'
+ );
+
+ assert.equal(
+ Markdown.format('This is a question about a link http://example.com?').trim(),
+ 'This is a question about a link http://example.com?
'
+ );
+
+ done();
+ });
+
+ it('Links with surrounding brackets', function(done) {
+ assert.equal(
+ Markdown.format('(http://example.com)').trim(),
+ '(http://example.com)
'
+ );
+
+ assert.equal(
+ Markdown.format('(see http://example.com)').trim(),
+ '(see http://example.com)
'
+ );
+
+ assert.equal(
+ Markdown.format('(http://example.com watch this)').trim(),
+ '(http://example.com watch this)
'
+ );
+
+ assert.equal(
+ Markdown.format('(www.example.com)').trim(),
+ '(www.example.com)
'
+ );
+
+ assert.equal(
+ Markdown.format('(see www.example.com)').trim(),
+ '(see www.example.com)
'
+ );
+
+ assert.equal(
+ Markdown.format('(www.example.com watch this)').trim(),
+ '(www.example.com watch this)
'
+ );
+ assert.equal(
+ Markdown.format('([link](http://example.com))').trim(),
+ '(link)
'
+ );
+
+ assert.equal(
+ Markdown.format('(see [link](http://example.com))').trim(),
+ '(see link)
'
+ );
+
+ assert.equal(
+ Markdown.format('([link](http://example.com) watch this)').trim(),
+ '(link watch this)
'
+ );
+
+ assert.equal(
+ Markdown.format('(test@example.com)').trim(),
+ '(test@example.com)
'
+ );
+
+ assert.equal(
+ Markdown.format('(email test@example.com)').trim(),
+ '(email test@example.com)
'
+ );
+
+ assert.equal(
+ Markdown.format('(test@example.com email)').trim(),
+ '(test@example.com email)
'
+ );
+
+ assert.equal(
+ Markdown.format('This is a sentence with a [link](http://example.com) in it.').trim(),
+ 'This is a sentence with a link in it.
'
+ );
+
+ assert.equal(
+ Markdown.format('This is a sentence with a link (http://example.com) in it.').trim(),
+ 'This is a sentence with a link (http://example.com) in it.
'
+ );
+
+ assert.equal(
+ Markdown.format('This is a sentence with a (https://en.wikipedia.org/wiki/Rendering_(computer_graphics)) in it.').trim(),
+ 'This is a sentence with a (https://en.wikipedia.org/wiki/Rendering_(computer_graphics)) in it.
'
+ );
+
+ done();
+ });
+
+ it('Searching for links', function(done) {
+ assert.equal(
+ TextFormatting.formatText('https://en.wikipedia.org/wiki/Unix', {searchTerm: 'wikipedia'}).trim(),
+ 'https://en.wikipedia.org/wiki/Unix
'
+ );
+
+ assert.equal(
+ TextFormatting.formatText('[Link](https://en.wikipedia.org/wiki/Unix)', {searchTerm: 'unix'}).trim(),
+ 'Link
'
+ );
+
+ done();
+ });
+});
diff --git a/webapp/utils/markdown.jsx b/webapp/utils/markdown.jsx
index 028e667fda..f6b218812a 100644
--- a/webapp/utils/markdown.jsx
+++ b/webapp/utils/markdown.jsx
@@ -6,12 +6,11 @@ import * as SyntaxHighlighting from './syntax_hightlighting.jsx';
import marked from 'marked';
import katex from 'katex';
-import 'katex/dist/katex.min.css';
function markdownImageLoaded(image) {
image.style.height = 'auto';
}
-window.markdownImageLoaded = markdownImageLoaded;
+global.markdownImageLoaded = markdownImageLoaded;
class MattermostMarkdownRenderer extends marked.Renderer {
constructor(options, formattingOptions = {}) {
@@ -63,11 +62,11 @@ class MattermostMarkdownRenderer extends marked.Renderer {
const content = SyntaxHighlighting.highlight(usedLanguage, code);
let searchedContent = '';
- if (this.formattingOptions.searchTerm) {
+ if (this.formattingOptions.searchPatterns) {
const tokens = new Map();
let searched = TextFormatting.sanitizeHtml(code);
- searched = TextFormatting.highlightSearchTerms(searched, tokens, this.formattingOptions.searchTerm);
+ searched = TextFormatting.highlightSearchTerms(searched, tokens, this.formattingOptions.searchPatterns);
if (tokens.size > 0) {
searched = TextFormatting.replaceTokens(searched, tokens);
@@ -94,9 +93,9 @@ class MattermostMarkdownRenderer extends marked.Renderer {
codespan(text) {
let output = text;
- if (this.formattingOptions.searchTerm) {
+ if (this.formattingOptions.searchPatterns) {
const tokens = new Map();
- output = TextFormatting.highlightSearchTerms(output, tokens, this.formattingOptions.searchTerm);
+ output = TextFormatting.highlightSearchTerms(output, tokens, this.formattingOptions.searchPatterns);
output = TextFormatting.replaceTokens(output, tokens);
}
@@ -149,11 +148,22 @@ class MattermostMarkdownRenderer extends marked.Renderer {
outHref = `http://${outHref}`;
}
- let output = ' 1 ? fileSplit[fileSplit.length - 1] : '';
ext = ext.toLowerCase();
+
for (var key in HighlightedLanguages) {
if (HighlightedLanguages[key].extensions.find((x) => x === ext)) {
return key;
}
}
+
return null;
}
diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx
index c110fc52f3..f97c74625d 100644
--- a/webapp/utils/text_formatting.jsx
+++ b/webapp/utils/text_formatting.jsx
@@ -2,15 +2,11 @@
// See License.txt for license information.
import Autolinker from 'autolinker';
-import {browserHistory} from 'react-router/es6';
import Constants from './constants.jsx';
import EmojiStore from 'stores/emoji_store.jsx';
import * as Emoticons from './emoticons.jsx';
import * as Markdown from './markdown.jsx';
-import PreferenceStore from 'stores/preference_store.jsx';
-import UserStore from 'stores/user_store.jsx';
import twemoji from 'twemoji';
-import * as Utils from './utils.jsx';
import XRegExp from 'xregexp';
// pattern to detect the existance of a Chinese, Japanese, or Korean character in a string
@@ -22,16 +18,19 @@ const cjkPattern = /[\u3000-\u303f\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-
// as part of the second parameter:
// - searchTerm - If specified, this word is highlighted in the resulting html. Defaults to nothing.
// - mentionHighlight - Specifies whether or not to highlight mentions of the current user. Defaults to true.
+// - mentionKeys - A list of mention keys for the current user to highlight.
// - singleline - Specifies whether or not to remove newlines. Defaults to false.
// - emoticons - Enables emoticon parsing. Defaults to true.
// - markdown - Enables markdown parsing. Defaults to true.
-export function formatText(text, options = {}) {
+// - siteURL - The origin of this Mattermost instance. If provided, links to channels and posts will be replaced with internal
+// links that can be handled by a special click handler.
+// - usernameMap - An object mapping usernames to users. If provided, at mentions will be replaced with internal links that can
+// be handled by a special click handler (Utils.handleFormattedTextClick)
+export function formatText(text, inputOptions) {
let output = text;
- // would probably make more sense if it was on the calling components, but this option is intended primarily for debugging
- if (window.mm_config.EnableDeveloper === 'true' && PreferenceStore.get(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'formatting', 'true') === 'false') {
- return output;
- }
+ const options = Object.assign({}, inputOptions);
+ options.searchPatterns = parseSearchTerms(options.searchTerm).map(convertSearchTermToRegex);
if (!('markdown' in options) || options.markdown) {
// the markdown renderer will call doFormatText as necessary
@@ -58,7 +57,10 @@ export function doFormatText(text, options) {
const tokens = new Map();
// replace important words and phrases with tokens
- output = autolinkAtMentions(output, tokens);
+ if (options.usernameMap) {
+ output = autolinkAtMentions(output, tokens, options.usernameMap);
+ }
+
output = autolinkEmails(output, tokens);
output = autolinkHashtags(output, tokens);
@@ -66,12 +68,12 @@ export function doFormatText(text, options) {
output = Emoticons.handleEmoticons(output, tokens, options.emojis || EmojiStore.getEmojis());
}
- if (options.searchTerm) {
- output = highlightSearchTerms(output, tokens, options.searchTerm);
+ if (options.searchPatterns) {
+ output = highlightSearchTerms(output, tokens, options.searchPatterns);
}
if (!('mentionHighlight' in options) || options.mentionHighlight) {
- output = highlightCurrentMentions(output, tokens);
+ output = highlightCurrentMentions(output, tokens, options.mentionKeys);
}
if (!('emoticons' in options) || options.emoticon) {
@@ -143,10 +145,10 @@ function autolinkEmails(text, tokens) {
const punctuation = XRegExp.cache('[^\\pL\\d]');
-function autolinkAtMentions(text, tokens) {
+function autolinkAtMentions(text, tokens, usernameMap) {
// Test if provided text needs to be highlighted, special mention or current user
function mentionExists(u) {
- return (Constants.SPECIAL_MENTIONS.indexOf(u) !== -1 || UserStore.getProfileByUsername(u));
+ return (Constants.SPECIAL_MENTIONS.indexOf(u) !== -1 || !!usernameMap[u]);
}
function addToken(username, mention) {
@@ -200,12 +202,9 @@ export function escapeRegex(text) {
return text.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
}
-function highlightCurrentMentions(text, tokens) {
+function highlightCurrentMentions(text, tokens, mentionKeys = []) {
let output = text;
- const mentionKeys = UserStore.getCurrentMentionKeys();
- mentionKeys.push('@here');
-
// look for any existing tokens which are self mentions and should be highlighted
var newTokens = new Map();
for (const [alias, token] of tokens) {
@@ -239,7 +238,7 @@ function highlightCurrentMentions(text, tokens) {
return prefix + alias;
}
- for (const mention of UserStore.getCurrentMentionKeys()) {
+ for (const mention of mentionKeys) {
if (!mention) {
continue;
}
@@ -369,10 +368,8 @@ function convertSearchTermToRegex(term) {
return new RegExp(pattern, 'gi');
}
-export function highlightSearchTerms(text, tokens, searchTerm) {
- const terms = parseSearchTerms(searchTerm);
-
- if (terms.length === 0) {
+export function highlightSearchTerms(text, tokens, searchPatterns) {
+ if (!searchPatterns || searchPatterns.length === 0) {
return text;
}
@@ -390,13 +387,11 @@ export function highlightSearchTerms(text, tokens, searchTerm) {
return prefix + alias;
}
- for (const term of terms) {
+ for (const pattern of searchPatterns) {
// highlight existing tokens matching search terms
- const trimmedTerm = term.replace(/\*$/, '').toLowerCase();
var newTokens = new Map();
for (const [alias, token] of tokens) {
- if (token.originalText.toLowerCase() === trimmedTerm ||
- (token.hashtag && token.hashtag.toLowerCase() === trimmedTerm)) {
+ if (pattern.test(token.originalText)) {
const index = tokens.size + newTokens.size;
const newAlias = `MM_SEARCHTERM${index}`;
@@ -414,7 +409,7 @@ export function highlightSearchTerms(text, tokens, searchTerm) {
tokens.set(newToken[0], newToken[1]);
}
- output = output.replace(convertSearchTermToRegex(term), replaceSearchTermWithToken);
+ output = output.replace(pattern, replaceSearchTermWithToken);
}
return output;
@@ -438,32 +433,6 @@ function replaceNewlines(text) {
return text.replace(/\n/g, ' ');
}
-// A click handler that can be used with the results of TextFormatting.formatText to add default functionality
-// to clicked hashtags and @mentions.
-export function handleClick(e) {
- const mentionAttribute = e.target.getAttributeNode('data-mention');
- const hashtagAttribute = e.target.getAttributeNode('data-hashtag');
- const linkAttribute = e.target.getAttributeNode('data-link');
-
- if (mentionAttribute) {
- e.preventDefault();
-
- Utils.searchForTerm(mentionAttribute.value);
- } else if (hashtagAttribute) {
- e.preventDefault();
-
- Utils.searchForTerm(hashtagAttribute.value);
- } else if (linkAttribute) {
- const MIDDLE_MOUSE_BUTTON = 1;
-
- if (!(e.button === MIDDLE_MOUSE_BUTTON || e.altKey || e.ctrlKey || e.metaKey || e.shiftKey)) {
- e.preventDefault();
-
- browserHistory.push(linkAttribute.value);
- }
- }
-}
-
//replace all "/" inside tags to "/"
function insertLongLinkWbr(test) {
return test.replace(/\//g, (match, position, string) => {
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index a880c17832..3059ce5290 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -1344,3 +1344,27 @@ export function isValidPassword(password) {
export function getSiteURL() {
return global.mm_config.SiteURL || window.location.origin;
}
+
+export function handleFormattedTextClick(e) {
+ const mentionAttribute = e.target.getAttributeNode('data-mention');
+ const hashtagAttribute = e.target.getAttributeNode('data-hashtag');
+ const linkAttribute = e.target.getAttributeNode('data-link');
+
+ if (mentionAttribute) {
+ e.preventDefault();
+
+ searchForTerm(mentionAttribute.value);
+ } else if (hashtagAttribute) {
+ e.preventDefault();
+
+ searchForTerm(hashtagAttribute.value);
+ } else if (linkAttribute) {
+ const MIDDLE_MOUSE_BUTTON = 1;
+
+ if (!(e.button === MIDDLE_MOUSE_BUTTON || e.altKey || e.ctrlKey || e.metaKey || e.shiftKey)) {
+ e.preventDefault();
+
+ browserHistory.push(linkAttribute.value);
+ }
+ }
+}
\ No newline at end of file