diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-06-17 09:23:19 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-06-17 09:23:19 -0400 |
| commit | f1a2e4835477c81863625c4460fd363876de0f07 (patch) | |
| tree | 3d3bb2dd93c117e95daf8207744de38d5fb0bca0 /web/react/components/textbox.jsx | |
| parent | 5a8f8397167cec8cba29b70bb7dbdda9ba0265f7 (diff) | |
| download | chat-f1a2e4835477c81863625c4460fd363876de0f07.tar.gz chat-f1a2e4835477c81863625c4460fd363876de0f07.tar.bz2 chat-f1a2e4835477c81863625c4460fd363876de0f07.zip | |
fixes mm-1250 mention highlights should now align in textbox
Diffstat (limited to 'web/react/components/textbox.jsx')
| -rw-r--r-- | web/react/components/textbox.jsx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx index 45798809f..05fbb57d1 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(); |