From 3a55cc6dcb8e45b65debd7569a49961faa55b402 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Thu, 13 Aug 2015 16:00:55 -0700 Subject: [PATCH] Minor refactoring for better maintainibility --- web/react/components/file_upload_overlay.jsx | 12 +++++++++++- web/react/components/post_right.jsx | 9 +++------ web/react/pages/channel.jsx | 3 ++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/web/react/components/file_upload_overlay.jsx b/web/react/components/file_upload_overlay.jsx index a82f02af12..28d66d817e 100644 --- a/web/react/components/file_upload_overlay.jsx +++ b/web/react/components/file_upload_overlay.jsx @@ -3,9 +3,19 @@ module.exports = React.createClass({ displayName: 'FileUploadOverlay', + propTypes: { + overlayType: React.PropTypes.string + }, render: function() { + var overlayClass = 'file-overlay invisible'; + if (this.props.overlayType === 'right') { + overlayClass += ' right-file-overlay'; + } else if (this.props.overlayType === 'center') { + overlayClass += ' center-file-overlay'; + } + return ( -
+
Drop a file to upload it. diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index 09cd8cb568..e46979ff7c 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,12 +297,8 @@ module.exports = React.createClass({ return (
-
-
- - Drop a file to upload it. -
-
+
{searchForm}
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index 922e61d1a7..3ef6817f37 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -225,7 +225,8 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann ); React.render( - , + , document.getElementById('file_upload_overlay') );