From 3cc1b1ad821d1130fca965a030638895be9449d7 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 29 Nov 2015 03:21:21 +0000 Subject: [PATCH] fix unwanted vertical scrollbar issue and typo --- src/components/views/messages/MessageComposer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/messages/MessageComposer.js b/src/components/views/messages/MessageComposer.js index 313dad3666..eefec48cff 100644 --- a/src/components/views/messages/MessageComposer.js +++ b/src/components/views/messages/MessageComposer.js @@ -239,7 +239,7 @@ module.exports = React.createClass({ // temporarily crimp clientHeight to 0 to get an accurate scrollHeight value this.refs.textarea.style.height = "0px"; var newHeight = this.refs.textarea.scrollHeight < 100 ? this.refs.textarea.scrollHeight : 100; - this.refs.textarea.style.height = newHeight + "px"; + this.refs.textarea.style.height = Math.ceil(newHeight) + "px"; if (this.props.roomView) { // kick gemini-scrollbar to re-layout this.props.roomView.forceUpdate(); @@ -317,7 +317,7 @@ module.exports = React.createClass({ } var htmlText; - if (this.markdownEnabled) && (htmlText = mdownToHtml(contentText)) !== contentText) { + if (this.markdownEnabled && (htmlText = mdownToHtml(contentText)) !== contentText) { sendMessagePromise = isEmote ? MatrixClientPeg.get().sendHtmlEmote(this.props.room.roomId, contentText, htmlText) : MatrixClientPeg.get().sendHtmlMessage(this.props.room.roomId, contentText, htmlText);