diff options
| author | Maxim <mail@potapovmax.com> | 2015-10-13 10:15:44 +0300 |
|---|---|---|
| committer | Maxim <mail@potapovmax.com> | 2015-10-13 10:15:44 +0300 |
| commit | 9d3248ccec89e533527bb86e082ef445c3cdfe7d (patch) | |
| tree | fea41f942c66a2ae397ed12f1013585bcbf7775c /web/react/components/textbox.jsx | |
| parent | 53d58fc3374268484a6eb5d8aae2c82719ec782d (diff) | |
| parent | 0144b6fd8a95c6b65695b07483a528707dce1cfe (diff) | |
| download | chat-9d3248ccec89e533527bb86e082ef445c3cdfe7d.tar.gz chat-9d3248ccec89e533527bb86e082ef445c3cdfe7d.tar.bz2 chat-9d3248ccec89e533527bb86e082ef445c3cdfe7d.zip | |
Merge branch 'master' into PLT-590
Diffstat (limited to 'web/react/components/textbox.jsx')
| -rw-r--r-- | web/react/components/textbox.jsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx index 0563c294a..741dbcd5d 100644 --- a/web/react/components/textbox.jsx +++ b/web/react/components/textbox.jsx @@ -246,9 +246,11 @@ export default class Textbox extends React.Component { if (e.scrollHeight - mod < 167) { $(e).css({height: 'auto', 'overflow-y': 'hidden'}).height(e.scrollHeight - mod); $(w).css({height: 'auto'}).height(e.scrollHeight + 2); + $(w).closest('.post-body__cell').removeClass('scroll'); } else { $(e).css({height: 'auto', 'overflow-y': 'scroll'}).height(167); $(w).css({height: 'auto'}).height(167); + $(w).closest('.post-body__cell').addClass('scroll'); } if (prevHeight !== $(e).height() && this.props.onHeightChange) { |