PLT-6200 Fixed file upload button not working on iOS (#6013)
Этот коммит содержится в:
коммит произвёл
George Goldberg
родитель
1901adffa5
Коммит
a56310ba8f
@@ -350,11 +350,16 @@ class FileUpload extends React.Component {
|
|||||||
const channelId = this.props.channelId || ChannelStore.getCurrentId();
|
const channelId = this.props.channelId || ChannelStore.getCurrentId();
|
||||||
|
|
||||||
const uploadsRemaining = Constants.MAX_UPLOAD_FILES - this.props.getFileCount(channelId);
|
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}
|
let emojiSpan;
|
||||||
onClick={this.emojiClick}
|
if (this.props.emojiEnabled) {
|
||||||
/>);
|
emojiSpan = (
|
||||||
const filestyle = {visibility: 'hidden'};
|
<span
|
||||||
|
className={'fa fa-smile-o icon--emoji-picker emoji-' + this.props.navBarName}
|
||||||
|
onClick={this.emojiClick}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
@@ -363,20 +368,19 @@ class FileUpload extends React.Component {
|
|||||||
>
|
>
|
||||||
<div className='icon--attachment'>
|
<div className='icon--attachment'>
|
||||||
<span
|
<span
|
||||||
|
className='icon'
|
||||||
dangerouslySetInnerHTML={{__html: Constants.ATTACHMENT_ICON_SVG}}
|
dangerouslySetInnerHTML={{__html: Constants.ATTACHMENT_ICON_SVG}}
|
||||||
onClick={() => this.refs.fileInput.click()}
|
|
||||||
/>
|
/>
|
||||||
<input
|
<input
|
||||||
ref='fileInput'
|
ref='fileInput'
|
||||||
type='file'
|
type='file'
|
||||||
style={filestyle}
|
|
||||||
onChange={this.handleChange}
|
onChange={this.handleChange}
|
||||||
onClick={uploadsRemaining > 0 ? this.props.onClick : this.handleMaxUploadReached}
|
onClick={uploadsRemaining > 0 ? this.props.onClick : this.handleMaxUploadReached}
|
||||||
multiple={multiple}
|
multiple={multiple}
|
||||||
accept={accept}
|
accept={accept}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{this.props.emojiEnabled ? emojiSpan : ''}
|
{emojiSpan}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,14 +33,9 @@
|
|||||||
.msg-typing {
|
.msg-typing {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.post-create__container{
|
.icon--emoji-picker {
|
||||||
.post-create-body {
|
display: none;
|
||||||
.icon__postcontent_picker {
|
|
||||||
display:none;
|
|
||||||
top: -7px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user