diff options
author | Corey Hulen <corey@hulen.com> | 2016-02-04 15:36:28 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-02-04 15:36:28 -0800 |
commit | 392b878a108492a56cbc2ed68acc7130cac96c0d (patch) | |
tree | 71bd17bbd191d0e010ea38e4c5e902cde635c61e /web/react/components/textbox.jsx | |
parent | af6ade338002a215ff7c7771f7fe6bbbb06f0cd7 (diff) | |
parent | c4344f8c02227f77165f4592e0c87c323b7e00f5 (diff) | |
download | chat-392b878a108492a56cbc2ed68acc7130cac96c0d.tar.gz chat-392b878a108492a56cbc2ed68acc7130cac96c0d.tar.bz2 chat-392b878a108492a56cbc2ed68acc7130cac96c0d.zip |
Merge pull request #2071 from hmhealey/plt1820
PLT-1820/PLT-1847 Cleaned up textbox focus code
Diffstat (limited to 'web/react/components/textbox.jsx')
-rw-r--r-- | web/react/components/textbox.jsx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx index 00e5ace98..ec299087d 100644 --- a/web/react/components/textbox.jsx +++ b/web/react/components/textbox.jsx @@ -20,6 +20,7 @@ export default class Textbox extends React.Component { constructor(props) { super(props); + this.focus = this.focus.bind(this); this.getStateFromStores = this.getStateFromStores.bind(this); this.onRecievedError = this.onRecievedError.bind(this); this.handleKeyPress = this.handleKeyPress.bind(this); @@ -81,6 +82,10 @@ export default class Textbox extends React.Component { } } + focus() { + this.refs.message.getTextbox().focus(); + } + resize() { const textbox = this.refs.message.getTextbox(); const $textbox = $(textbox); @@ -90,8 +95,6 @@ export default class Textbox extends React.Component { const borders = parseInt($textbox.css('border-bottom-width'), 10) + parseInt($textbox.css('border-top-width'), 10); const maxHeight = parseInt($textbox.css('max-height'), 10) - borders; - const prevHeight = $textbox.height(); - // set the height to auto and remove the scrollbar so we can get the actual size of the contents $textbox.css('height', 'auto').css('overflow-y', 'hidden'); @@ -116,10 +119,6 @@ export default class Textbox extends React.Component { if (this.state.preview) { $(ReactDOM.findDOMNode(this.refs.preview)).height(height + borders); } - - if (height !== prevHeight && this.props.onHeightChange) { - this.props.onHeightChange(); - } } showPreview(e) { @@ -211,7 +210,6 @@ Textbox.propTypes = { messageText: React.PropTypes.string.isRequired, onUserInput: React.PropTypes.func.isRequired, onKeyPress: React.PropTypes.func.isRequired, - onHeightChange: React.PropTypes.func, createMessage: React.PropTypes.string.isRequired, onKeyDown: React.PropTypes.func, supportsCommands: React.PropTypes.bool.isRequired |