From efef3e8ee270655dcf91f9cd322e43f64c1a1ff8 Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Fri, 19 Aug 2016 12:52:48 -0400 Subject: Ctrl+Enter sends messages in mobile view (#3833) --- webapp/components/create_comment.jsx | 3 ++- webapp/components/create_post.jsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'webapp') diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx index 2b4800bf4..0e4a7d7e6 100644 --- a/webapp/components/create_comment.jsx +++ b/webapp/components/create_comment.jsx @@ -15,6 +15,7 @@ import MsgTyping from './msg_typing.jsx'; import FileUpload from './file_upload.jsx'; import FilePreview from './file_preview.jsx'; import * as Utils from 'utils/utils.jsx'; +import * as UserAgent from 'utils/user_agent.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import Constants from 'utils/constants.jsx'; @@ -168,7 +169,7 @@ export default class CreateComment extends React.Component { } commentMsgKeyPress(e) { - if (!Utils.isMobile() && ((this.state.ctrlSend && e.ctrlKey) || !this.state.ctrlSend)) { + if (!UserAgent.isMobileApp() && ((this.state.ctrlSend && e.ctrlKey) || !this.state.ctrlSend)) { if (e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) { e.preventDefault(); ReactDOM.findDOMNode(this.refs.textbox).blur(); diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index c9b796107..bfacd0644 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -13,6 +13,7 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; +import * as UserAgent from 'utils/user_agent.jsx'; import * as ChannelActions from 'actions/channel_actions.jsx'; import ChannelStore from 'stores/channel_store.jsx'; @@ -198,7 +199,7 @@ export default class CreatePost extends React.Component { } postMsgKeyPress(e) { - if (!Utils.isMobile() && ((this.state.ctrlSend && e.ctrlKey) || !this.state.ctrlSend)) { + if (!UserAgent.isMobileApp() && ((this.state.ctrlSend && e.ctrlKey) || !this.state.ctrlSend)) { if (e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) { e.preventDefault(); ReactDOM.findDOMNode(this.refs.textbox).blur(); -- cgit v1.2.3-1-g7c22