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

Removes the blue tag highlighting from mentions that would appear after typing a mention

Browse Source
This commit is contained in:
Reed Garmsen
2015-07-23 14:04:33 -07:00
parent a9d48ff994
commit 414c2bed91
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/react/components/textbox.jsx
View File

@@ -119,13 +119,8 @@ module.exports = React.createClass({
},
updateTextdiv: function() {
var html = utils.insertHtmlEntities(this.refs.message.getDOMNode().value);
for (var k in this.mentions) {
var m = this.mentions[k];
var re = new RegExp('( |^)@' + m + '( |$|\n)', 'm');
html = html.replace(re, '$1<span class="mention">@'+m+'</span>$2');
}
var re2 = new RegExp('(^$)(?![.\n])', 'gm');
html = html.replace(re2, '<br/><br/>');
var re = new RegExp('(^$)(?![.\n])', 'gm');
html = html.replace(re, '<br/><br/>');
$(this.refs.textdiv.getDOMNode()).html(html);
},
handleChange: function() {
@@ -181,7 +176,7 @@ module.exports = React.createClass({
}
},
processMentions: function() {
/* First, find all the possible mentions, highlight them in the HTML and add
/* First, find all the possible mentions and add
them all to a list of mentions */
var text = utils.insertHtmlEntities(this.refs.message.getDOMNode().value);
@@ -194,7 +189,6 @@ module.exports = React.createClass({
if (!matches) {
$(this.refs.textdiv.getDOMNode()).text(text);
this.updateMentionTab(null, []);
this.mentions = [];
return;
}
@@ -207,7 +201,7 @@ module.exports = React.createClass({
}
/* Figure out what the user is currently typing. If it's a mention then we don't
want to highlight it and add it to the mention list yet, so we remove it if
want to add it to the mention list yet, so we remove it if
there is only one occurence of that mention so far. */
var caret = utils.getCaretPosition(this.refs.message.getDOMNode());
@@ -225,14 +219,13 @@ module.exports = React.createClass({
typingMention = text.substring(atIndex+1, caret);
}
var re3 = new RegExp('@' + typingMention + '( |$|\n)', 'g');
var re2 = new RegExp('@' + typingMention + '( |$|\n)', 'g');
if ((text.match(re3) || []).length === 1 && mentions.indexOf(typingMention) !== -1) {
if ((text.match(re2) || []).length === 1 && mentions.indexOf(typingMention) !== -1) {
mentions.splice(mentions.indexOf(typingMention), 1);
}
this.updateMentionTab(null, mentions);
this.mentions = mentions;
},
checkForNewMention: function(text) {
var caret = utils.getCaretPosition(this.refs.message.getDOMNode());