diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-18 14:42:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-18 14:42:32 -0400 |
commit | ab67f6e257f6e8f08145a02a7b93550f99641be4 (patch) | |
tree | d33d1c58a3d229f7e37db58bc2c397ac3806c503 /webapp/actions/file_actions.jsx | |
parent | 0231e95f1c5a8c42ba97875f0d2301815f552974 (diff) | |
download | chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.gz chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.bz2 chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.zip |
PLT-6215 Major post list refactor (#6501)
* Major post list refactor
* Fix post and thread deletion
* Fix preferences not selecting correctly
* Fix military time displaying
* Fix UP key for editing posts
* Fix ESLint error
* Various fixes and updates per feedback
* Fix for permalink view
* Revert to old scrolling method and various fixes
* Add floating timestamp, new message indicator, scroll arrows
* Update post loading for focus mode and add visibility limit
* Fix pinning posts and a react warning
* Add loading UI updates from Asaad
* Fix refreshing loop
* Temporarily bump post visibility limit
* Update infinite scrolling
* Remove infinite scrolling
Diffstat (limited to 'webapp/actions/file_actions.jsx')
-rw-r--r-- | webapp/actions/file_actions.jsx | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/webapp/actions/file_actions.jsx b/webapp/actions/file_actions.jsx index 204f452d8..628144676 100644 --- a/webapp/actions/file_actions.jsx +++ b/webapp/actions/file_actions.jsx @@ -1,25 +1,24 @@ // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import * as AsyncClient from 'utils/async_client.jsx'; -import Client from 'client/web_client.jsx'; +import store from 'stores/redux_store.jsx'; +const dispatch = store.dispatch; +const getState = store.getState; +import {uploadFile as uploadFileRedux} from 'mattermost-redux/actions/files'; export function uploadFile(file, name, channelId, clientId, success, error) { - Client.uploadFile( - file, - name, - channelId, - clientId, + const fileFormData = new FormData(); + fileFormData.append('files', file, name); + fileFormData.append('channel_id', channelId); + fileFormData.append('client_ids', clientId); + + uploadFileRedux(channelId, null, [clientId], fileFormData)(dispatch, getState).then( (data) => { - if (success) { + if (data && success) { success(data); - } - }, - (err) => { - AsyncClient.dispatchError(err, 'uploadFile'); - - if (error) { - error(err); + } else if (data == null && error) { + const serverError = getState().requests.files.uploadFiles.error; + error({id: serverError.server_error_id, ...serverError}); } } ); |