Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Prevent selection of unacceptable Content-Type files (#2910)

Browse source 
* Prevent selection of unacceptable Content-Type files

* replace hard code

* media_attachments accept content-types in initial state
This commit is contained in:
Yamagishi Kazutoshi 2017-05-08 23:49:53 +09:00 • committed by Eugen Rochko
parent 7140def5c9
commit 459bbfa4b2
5 changed files with 46 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/javascript/mastodon/features/compose/components/upload_button.js
View file

@ -2,11 +2,19 @@ import React from 'react';
import IconButton from '../../../components/icon_button';
import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl';
import { connect } from 'react-redux';
const messages = defineMessages({
upload: { id: 'upload_button.label', defaultMessage: 'Add media' }
});
const makeMapStateToProps = () => {
const mapStateToProps = (state, props) => ({
acceptContentTypes: state.getIn(['media_attachments', 'accept_content_types']).toArray(),
});
return mapStateToProps;
}
const iconStyle = {
height: null,
@ -38,12 +46,21 @@ class UploadButton extends React.PureComponent {
render () {
const { intl, resetFileKey, disabled } = this.props;
const { intl, resetFileKey, disabled, acceptContentTypes } = this.props;
return (
<div className='compose-form__upload-button'>
<IconButton icon='camera' title={intl.formatMessage(messages.upload)} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle}/>
<input key={resetFileKey} ref={this.setRef} type='file' multiple={false} onChange={this.handleChange} disabled={disabled} style={{ display: 'none' }} />
<input
key={resetFileKey}
ref={this.setRef}
type='file'
multiple={false}
accept={ acceptContentTypes.join(',')}
onChange={this.handleChange}
disabled={disabled}
style={{ display: 'none' }}
/>
</div>
);
}
@ -55,7 +72,8 @@ UploadButton.propTypes = {
onSelectFile: PropTypes.func.isRequired,
style: PropTypes.object,
resetFileKey: PropTypes.number,
acceptContentTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
intl: PropTypes.object.isRequired
};
export default injectIntl(UploadButton);
export default connect(makeMapStateToProps)(injectIntl(UploadButton));