diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-08-03 00:01:33 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-08-02 20:01:33 -0800 |
commit | 1de3bd3b4340cb51b2699a14a92d653db988a988 (patch) | |
tree | 604703f9acf4ea3b71f30bdfa532020e9fb233be /webapp/components/file_upload.jsx | |
parent | 790dd91e7d93b5debaf86915c34f8a73a3ff95bd (diff) | |
download | chat-1de3bd3b4340cb51b2699a14a92d653db988a988.tar.gz chat-1de3bd3b4340cb51b2699a14a92d653db988a988.tar.bz2 chat-1de3bd3b4340cb51b2699a14a92d653db988a988.zip |
PLT-3640 Add mobile landing pages (#3674)
* PLT-3640 Moved all clientside user agent snooping into a single file
* PLT-3640 Added mobile landing pages on login to iOS and Android web apps
* PLT-3640 Moved landing page to appear before first login
* PLT-3640 Fixed detection of Chrome on Android
* PLT-3640 Disabled mobile landing pages when their respective URLs are set to blank
Diffstat (limited to 'webapp/components/file_upload.jsx')
-rw-r--r-- | webapp/components/file_upload.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx index 088e8bde7..39abec7e4 100644 --- a/webapp/components/file_upload.jsx +++ b/webapp/components/file_upload.jsx @@ -8,6 +8,7 @@ import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import DelayedAction from 'utils/delayed_action.jsx'; +import * as UserAgent from 'utils/user_agent.jsx'; import * as Utils from 'utils/utils.jsx'; import {intlShape, injectIntl, defineMessages} from 'react-intl'; @@ -311,13 +312,13 @@ class FileUpload extends React.Component { render() { let multiple = true; - if (Utils.isMobileApp()) { + if (UserAgent.isMobileApp()) { // iOS WebViews don't upload videos properly in multiple mode multiple = false; } let accept = ''; - if (Utils.isIosChrome()) { + if (UserAgent.isIosChrome()) { // iOS Chrome can't upload videos at all accept = 'image/*'; } |