PLT-6200 Fixed file upload button not working on iOS (#6013)

This commit is contained in:
Harrison Healey
2017-04-07 14:18:46 -04:00
committed by George Goldberg
parent 1901adffa5
commit a56310ba8f
2 changed files with 14 additions and 15 deletions

View File

@@ -350,11 +350,16 @@ class FileUpload extends React.Component {
const channelId = this.props.channelId || ChannelStore.getCurrentId();
const uploadsRemaining = Constants.MAX_UPLOAD_FILES - this.props.getFileCount(channelId);
const emojiSpan = (<span
className={'fa fa-smile-o icon--emoji-picker emoji-' + this.props.navBarName}
onClick={this.emojiClick}
/>);
const filestyle = {visibility: 'hidden'};
let emojiSpan;
if (this.props.emojiEnabled) {
emojiSpan = (
<span
className={'fa fa-smile-o icon--emoji-picker emoji-' + this.props.navBarName}
onClick={this.emojiClick}
/>
);
}
return (
<span
@@ -363,20 +368,19 @@ class FileUpload extends React.Component {
>
<div className='icon--attachment'>
<span
className='icon'
dangerouslySetInnerHTML={{__html: Constants.ATTACHMENT_ICON_SVG}}
onClick={() => this.refs.fileInput.click()}
/>
<input
ref='fileInput'
type='file'
style={filestyle}
onChange={this.handleChange}
onClick={uploadsRemaining > 0 ? this.props.onClick : this.handleMaxUploadReached}
multiple={multiple}
accept={accept}
/>
</div>
{this.props.emojiEnabled ? emojiSpan : ''}
{emojiSpan}
</span>
);
}

View File

@@ -33,14 +33,9 @@
.msg-typing {
display: none;
}
}
.post-create__container{
.post-create-body {
.icon__postcontent_picker {
display:none;
top: -7px;
}
.icon--emoji-picker {
display: none;
}
}