OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix unwanted vertical scrollbar issue and typo

pull/21833/head
Matthew Hodgson 2015-11-29 03:21:21 +00:00
parent f028b343b0
commit 3cc1b1ad82
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/messages/MessageComposer.js
View File

@ -239,7 +239,7 @@ module.exports = React.createClass({
// temporarily crimp clientHeight to 0 to get an accurate scrollHeight value // temporarily crimp clientHeight to 0 to get an accurate scrollHeight value
this.refs.textarea.style.height = "0px"; this.refs.textarea.style.height = "0px";
var newHeight = this.refs.textarea.scrollHeight < 100 ? this.refs.textarea.scrollHeight : 100; 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) { if (this.props.roomView) {
// kick gemini-scrollbar to re-layout // kick gemini-scrollbar to re-layout
this.props.roomView.forceUpdate(); this.props.roomView.forceUpdate();
@ -317,7 +317,7 @@ module.exports = React.createClass({
} }
var htmlText; var htmlText;
if (this.markdownEnabled) && (htmlText = mdownToHtml(contentText)) !== contentText) { if (this.markdownEnabled && (htmlText = mdownToHtml(contentText)) !== contentText) {
sendMessagePromise = isEmote ? sendMessagePromise = isEmote ?
MatrixClientPeg.get().sendHtmlEmote(this.props.room.roomId, contentText, htmlText) : MatrixClientPeg.get().sendHtmlEmote(this.props.room.roomId, contentText, htmlText) :
MatrixClientPeg.get().sendHtmlMessage(this.props.room.roomId, contentText, htmlText); MatrixClientPeg.get().sendHtmlMessage(this.props.room.roomId, contentText, htmlText);