diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
commit | 92d8fa4aa8af170d0018baed94a8787d06297e44 (patch) | |
tree | dc5000a3584952c797c03bf4331282a5e1536848 /webapp/components/file_upload.jsx | |
parent | 742bab6429aeb1b581275da3c06af99fe293baab (diff) | |
parent | 30974533941e73f102505d07badf538cfdbbf3fc (diff) | |
download | chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.gz chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.bz2 chat-92d8fa4aa8af170d0018baed94a8787d06297e44.zip |
Merge branch 'release-3.8'
Diffstat (limited to 'webapp/components/file_upload.jsx')
-rw-r--r-- | webapp/components/file_upload.jsx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx index c63576f78..af5d76829 100644 --- a/webapp/components/file_upload.jsx +++ b/webapp/components/file_upload.jsx @@ -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> ); } |