diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-09 14:12:40 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-09 14:12:40 +0100 |
| commit | def1f8c5b3ec4bc5bd8c8335b4919e011d2757b9 (patch) | |
| tree | 36ce2a57e7b686f19132ebb12fcd177b3df4c7c0 /app/assets/javascripts/components/features/compose/containers | |
| parent | d6a456dc714337a696e206c31d182630a94f89cd (diff) | |
| parent | 131bae89fd3ea601b032c9650edb3693801c9467 (diff) | |
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
Diffstat (limited to 'app/assets/javascripts/components/features/compose/containers')
| -rw-r--r-- | app/assets/javascripts/components/features/compose/containers/upload_button_container.jsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/components/features/compose/containers/upload_button_container.jsx b/app/assets/javascripts/components/features/compose/containers/upload_button_container.jsx index 4154b0737..7afa7d355 100644 --- a/app/assets/javascripts/components/features/compose/containers/upload_button_container.jsx +++ b/app/assets/javascripts/components/features/compose/containers/upload_button_container.jsx @@ -4,6 +4,7 @@ import { uploadCompose } from '../../../actions/compose'; const mapStateToProps = state => ({ disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 3 || state.getIn(['compose', 'media_attachments']).some(m => m.get('type') === 'video')), + key: Math.floor((Math.random() * 0x10000)) }); const mapDispatchToProps = dispatch => ({ |