diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-06 14:04:03 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-06 14:04:03 -0500 |
commit | 91c78682f5db0a6323753422f20c0a55a60ad35b (patch) | |
tree | 905d6ce0f0ac94f5cbb6c81bb68cc77460125907 /web/react/components/create_post.jsx | |
parent | 2e89344863ca0ddbda2679f85e3e399ac7536c81 (diff) | |
parent | d494283989752ad3e2dfdd3e06fb36bdd8947780 (diff) | |
download | chat-91c78682f5db0a6323753422f20c0a55a60ad35b.tar.gz chat-91c78682f5db0a6323753422f20c0a55a60ad35b.tar.bz2 chat-91c78682f5db0a6323753422f20c0a55a60ad35b.zip |
Merge pull request #2090 from hmhealey/plt1847
PLT-1847 Disabled keyboard focus code changes on mobile
Diffstat (limited to 'web/react/components/create_post.jsx')
-rw-r--r-- | web/react/components/create_post.jsx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index 6ea80cd13..ecabdaee6 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -63,6 +63,7 @@ class CreatePost extends React.Component { this.getFileCount = this.getFileCount.bind(this); this.handleKeyDown = this.handleKeyDown.bind(this); this.sendMessage = this.sendMessage.bind(this); + this.focusTextbox = this.focusTextbox.bind(this); PostStore.clearDraftUploads(); @@ -193,6 +194,11 @@ class CreatePost extends React.Component { } ); } + focusTextbox() { + if (!Utils.isMobile()) { + this.refs.textbox.focus(); + } + } postMsgKeyPress(e) { if (this.state.ctrlSend && e.ctrlKey || !this.state.ctrlSend) { if (e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) { @@ -216,7 +222,7 @@ class CreatePost extends React.Component { PostStore.storeCurrentDraft(draft); } handleUploadClick() { - this.refs.textbox.focus(); + this.focusTextbox(); } handleUploadStart(clientIds, channelId) { const draft = PostStore.getDraft(channelId); @@ -228,7 +234,7 @@ class CreatePost extends React.Component { // this is a bit redundant with the code that sets focus when the file input is clicked, // but this also resets the focus after a drag and drop - this.refs.textbox.focus(); + this.focusTextbox(); } handleFileUploadComplete(filenames, clientIds, channelId) { const draft = PostStore.getDraft(channelId); @@ -305,11 +311,12 @@ class CreatePost extends React.Component { componentDidMount() { ChannelStore.addChangeListener(this.onChange); PreferenceStore.addChangeListener(this.onPreferenceChange); - this.refs.textbox.focus(); + + this.focusTextbox(); } componentDidUpdate(prevProps, prevState) { if (prevState.channelId !== this.state.channelId) { - this.refs.textbox.focus(); + this.focusTextbox(); } } componentWillUnmount() { |