summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-10-04 14:38:19 -0400
committerGitHub <noreply@github.com>2016-10-04 14:38:19 -0400
commit816a738d28bd475a445963b95eb854614a12a032 (patch)
tree7ac4072699692ada4807f45c760d8089c252c0a6 /webapp/components
parentb9dc759449f11e0352f97164360cc400fbc112d8 (diff)
downloadchat-816a738d28bd475a445963b95eb854614a12a032.tar.gz
chat-816a738d28bd475a445963b95eb854614a12a032.tar.bz2
chat-816a738d28bd475a445963b95eb854614a12a032.zip
PLT-4343 Fixes for mobile main menu (#4148)
* Fixed mobile app link in the main menu to be displayed on mobile browsers * Fixed doubled up dividers in mobile menu * Added scrolling to mobile main menu
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/create_comment.jsx2
-rw-r--r--webapp/components/create_post.jsx2
-rw-r--r--webapp/components/edit_post_modal.jsx2
-rw-r--r--webapp/components/filtered_channel_list.jsx2
-rw-r--r--webapp/components/filtered_user_list.jsx2
5 files changed, 5 insertions, 5 deletions
diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx
index 133c2e6d2..1783f4d90 100644
--- a/webapp/components/create_comment.jsx
+++ b/webapp/components/create_comment.jsx
@@ -169,7 +169,7 @@ export default class CreateComment extends React.Component {
}
commentMsgKeyPress(e) {
- if (!UserAgent.isMobileApp() && ((this.state.ctrlSend && e.ctrlKey) || !this.state.ctrlSend)) {
+ if (!UserAgent.isMobile() && ((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 d3417e419..232edaa0c 100644
--- a/webapp/components/create_post.jsx
+++ b/webapp/components/create_post.jsx
@@ -199,7 +199,7 @@ export default class CreatePost extends React.Component {
}
postMsgKeyPress(e) {
- if (!UserAgent.isMobileApp() && ((this.state.ctrlSend && e.ctrlKey) || !this.state.ctrlSend)) {
+ if (!UserAgent.isMobile() && ((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/edit_post_modal.jsx b/webapp/components/edit_post_modal.jsx
index 24b1b5c3d..2ab4ec35f 100644
--- a/webapp/components/edit_post_modal.jsx
+++ b/webapp/components/edit_post_modal.jsx
@@ -95,7 +95,7 @@ export default class EditPostModal extends React.Component {
}
handleEditKeyPress(e) {
- if (!UserAgent.isMobileApp() && !this.state.ctrlSend && e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) {
+ if (!UserAgent.isMobile() && !this.state.ctrlSend && e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) {
e.preventDefault();
ReactDOM.findDOMNode(this.refs.editbox).blur();
this.handleEdit();
diff --git a/webapp/components/filtered_channel_list.jsx b/webapp/components/filtered_channel_list.jsx
index fd50704ff..64d033bc5 100644
--- a/webapp/components/filtered_channel_list.jsx
+++ b/webapp/components/filtered_channel_list.jsx
@@ -37,7 +37,7 @@ export default class FilteredChannelList extends React.Component {
componentDidMount() {
// only focus the search box on desktop so that we don't cause the keyboard to open on mobile
- if (!UserAgent.isMobileApp()) {
+ if (!UserAgent.isMobile()) {
ReactDOM.findDOMNode(this.refs.filter).focus();
}
}
diff --git a/webapp/components/filtered_user_list.jsx b/webapp/components/filtered_user_list.jsx
index 2f9a50d24..0e06d5943 100644
--- a/webapp/components/filtered_user_list.jsx
+++ b/webapp/components/filtered_user_list.jsx
@@ -62,7 +62,7 @@ class FilteredUserList extends React.Component {
componentDidMount() {
// only focus the search box on desktop so that we don't cause the keyboard to open on mobile
- if (!UserAgent.isMobileApp()) {
+ if (!UserAgent.isMobile()) {
ReactDOM.findDOMNode(this.refs.filter).focus();
}
}