diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-18 08:46:14 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-18 08:46:14 -0400 |
| commit | 96d1eb1c800a427e31e63970e57d0824a3bc91e3 (patch) | |
| tree | 4bf9b926fa3877de9bafaafcc0831e724e6fc7a3 /web/react/components/post_right.jsx | |
| parent | ab197e98358f4f48b81669182a361b6641132029 (diff) | |
| parent | 2c098d7711eda893f903329ab64528a7d387a6e8 (diff) | |
| download | chat-96d1eb1c800a427e31e63970e57d0824a3bc91e3.tar.gz chat-96d1eb1c800a427e31e63970e57d0824a3bc91e3.tar.bz2 chat-96d1eb1c800a427e31e63970e57d0824a3bc91e3.zip | |
Merge pull request #378 from rgarmsen2295/mm-316c
MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them
Diffstat (limited to 'web/react/components/post_right.jsx')
| -rw-r--r-- | web/react/components/post_right.jsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index ad8b54012..e46979ff7 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -11,6 +11,7 @@ var SearchBox =require('./search_bar.jsx'); var CreateComment = require( './create_comment.jsx' ); var Constants = require('../utils/constants.jsx'); var FileAttachmentList = require('./file_attachment_list.jsx'); +var FileUploadOverlay = require('./file_upload_overlay.jsx'); var ActionTypes = Constants.ActionTypes; RhsHeaderPost = React.createClass({ @@ -296,6 +297,8 @@ module.exports = React.createClass({ return ( <div className="post-right__container"> + <FileUploadOverlay + overlayType='right' /> <div className="search-bar__container sidebar--right__search-header">{searchForm}</div> <div className="sidebar-right__body"> <RhsHeaderPost fromSearch={this.props.fromSearch} isMentionSearch={this.props.isMentionSearch} /> |