From 9baafdb372d92c96a4063f11531f4fb5d9e7059e Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Tue, 11 Aug 2015 09:48:25 -0700 Subject: Changed structure to keep code contained to file_upload.jsx --- web/react/components/file_upload.jsx | 26 ++++++++++++++------------ web/react/components/post_list.jsx | 6 +----- web/react/components/post_right.jsx | 6 +----- 3 files changed, 16 insertions(+), 22 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx index a479883c9..e082abcd2 100644 --- a/web/react/components/file_upload.jsx +++ b/web/react/components/file_upload.jsx @@ -113,31 +113,33 @@ module.exports = React.createClass({ var self = this; if (this.props.postType === 'post') { - $('body').on('dragover', '.post-list__table', function(e) { + $('body').on('dragover dragleave', '.app__content', function(e) { e.preventDefault(); }); - $('body').on('dragenter', '.post-list__table', function(e) { + $('body').on('dragenter', '.app__content', function(e) { e.preventDefault(); + console.log('HERE'); + $('.app__content').addClass('center-file-overlay'); + $('.post-right__container').removeClass('right-file-overlay'); }); - $('body').on('dragleave', '.post-list__table', function(e) { - e.preventDefault(); - }); - $('body').on('drop', '.post-list__table', function(e) { + $('body').on('drop', '.app__content', function(e) { e.preventDefault(); + $('.app__content').removeClass('center-file-overlay'); self.handleDrop(e); }); } else if (this.props.postType === 'comment') { - $('body').on('dragover', '.sidebar--right', function(e) { - e.preventDefault(); - }); - $('body').on('dragenter', '.sidebar--right', function(e) { + $('body').on('dragover dragleave', '.post-right__container', function(e) { e.preventDefault(); }); - $('body').on('dragleave', '.sidebar--right', function(e) { + $('body').on('dragenter', '.post-right__container', function(e) { e.preventDefault(); + console.log('HERE RIGHT'); + $('.post-right__container').addClass('right-file-overlay'); + $('.app__content').removeClass('center-file-overlay'); }); - $('body').on('drop', '.sidebar--right', function(e) { + $('body').on('drop', '.post-right__container', function(e) { e.preventDefault(); + $('.post-right__container').removeClass('right-file-overlay'); self.handleDrop(e); }); } diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index cf0c4c663..826d34a7d 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -280,10 +280,6 @@ module.exports = React.createClass({ } ); }, - handleDragEnter: function() { - console.log("HERE ENTER"); - this.setState({fileDrag: true}); - }, getInitialState: function() { return getStateFromStores(); }, @@ -472,7 +468,7 @@ module.exports = React.createClass({ return (
-
+
{ more_messages } { postCtls } diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index f7f5ed509..ad993aee1 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -243,10 +243,6 @@ module.exports = React.createClass({ this.refs[id].forceUpdate(); } }, - handleDragEnter: function() { - console.log("HERE ENTER RIGHT"); - this.setState({fileDrag: true}); - }, getInitialState: function() { return getStateFromStores(); }, @@ -304,7 +300,7 @@ module.exports = React.createClass({ } return ( -
+
{searchForm}
-- cgit v1.2.3-1-g7c22