diff options
author | Corey Hulen <corey@hulen.com> | 2015-07-06 13:57:29 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-07-06 13:57:29 -0800 |
commit | 5bdc7f3762164d3f6cde58f77f96ef8c93bab884 (patch) | |
tree | ef98345b743fd7c055d539dd9d288f10bb1910d1 /web | |
parent | 3dec509899f60ca0d2eadfcc192ccc49969852ef (diff) | |
parent | f1a2e4835477c81863625c4460fd363876de0f07 (diff) | |
download | chat-5bdc7f3762164d3f6cde58f77f96ef8c93bab884.tar.gz chat-5bdc7f3762164d3f6cde58f77f96ef8c93bab884.tar.bz2 chat-5bdc7f3762164d3f6cde58f77f96ef8c93bab884.zip |
Merge pull request #132 from mattermost/mm-1250
fixes mm-1250 mention highlights should now align in textbox
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/mention_list.jsx | 4 | ||||
-rw-r--r-- | web/react/components/textbox.jsx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index 2fecc129a..b666fcfae 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -14,7 +14,7 @@ module.exports = React.createClass({ PostStore.addMentionDataChangeListener(this._onChange); var self = this; - $('#'+this.props.id).on('keypress.mentionlist', + $('body').on('keypress.mentionlist', '#'+this.props.id, function(e) { if (!self.isEmpty() && self.state.mentionText != '-1' && e.which === 13) { e.stopPropagation(); @@ -31,7 +31,7 @@ module.exports = React.createClass({ }, componentWillUnmount: function() { PostStore.removeMentionDataChangeListener(this._onChange); - $('#'+this.props.id).off('keypress.mentionlist'); + $('body').off('keypress.mentionlist', '#'+this.props.id); }, _onChange: function(id, mentionText, excludeList) { if (id !== this.props.id) return; diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx index 934e863a2..6b746aa78 100644 --- a/web/react/components/textbox.jsx +++ b/web/react/components/textbox.jsx @@ -78,6 +78,8 @@ module.exports = React.createClass({ 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/>'); $(this.refs.textdiv.getDOMNode()).html(html); }, handleChange: function() { @@ -262,6 +264,8 @@ module.exports = React.createClass({ $(d).css({'height':'auto','overflow-y':'scroll'}).height(167); $(w).css({'height':'auto'}).height(167); } + + $(d).scrollTop($(e).scrollTop()); }, handleFocus: function() { var elm = this.refs.message.getDOMNode(); |