diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-25 22:43:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 22:43:33 +0200 |
| commit | ed10ae2693e83ac7fbac7273b2cf2ca424aca0c4 (patch) | |
| tree | a9bc878edcd521969d50fcc54fcc30f7b2ca54b5 /app/javascript/flavours/glitch/features/compose/containers | |
| parent | 38d28824475056766c97385b66f4e04a5123e3a2 (diff) | |
| parent | 81bf43cfdd0d31ee4564a1399ce7fbe07eb04bb3 (diff) | |
Merge pull request #1138 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/compose/containers')
| -rw-r--r-- | app/javascript/flavours/glitch/features/compose/containers/options_container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/compose/containers/options_container.js b/app/javascript/flavours/glitch/features/compose/containers/options_container.js index c8c7ecd43..df842f3bf 100644 --- a/app/javascript/flavours/glitch/features/compose/containers/options_container.js +++ b/app/javascript/flavours/glitch/features/compose/containers/options_container.js @@ -16,7 +16,7 @@ function mapStateToProps (state) { acceptContentTypes: state.getIn(['media_attachments', 'accept_content_types']).toArray().join(','), resetFileKey: state.getIn(['compose', 'resetFileKey']), hasPoll: !!poll, - allowMedia: !poll && (media ? media.size < 4 && !media.some(item => item.get('type') === 'video') : true), + allowMedia: !poll && (media ? media.size < 4 && !media.some(item => ['video', 'audio'].includes(item.get('type'))) : true), hasMedia: media && !!media.size, allowPoll: !(media && !!media.size), showContentTypeChoice: state.getIn(['local_settings', 'show_content_type_choice']), |