From 81d7599f75b11d619f8ee9440394de3f9f86f39f Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Sun, 9 Aug 2015 13:04:24 -0700 Subject: Working on adding overlays for file drag and drop --- web/react/components/post_right.jsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'web/react/components/post_right.jsx') diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index ad8b54012..f7f5ed509 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -243,6 +243,10 @@ module.exports = React.createClass({ this.refs[id].forceUpdate(); } }, + handleDragEnter: function() { + console.log("HERE ENTER RIGHT"); + this.setState({fileDrag: true}); + }, getInitialState: function() { return getStateFromStores(); }, @@ -294,8 +298,13 @@ module.exports = React.createClass({ var currentId = UserStore.getCurrentId(); var searchForm = currentId == null ? null : ; + var fileDragOverlay = ''; + if (this.state.fileDrag) { + fileDragOverlay = 'post-right-file-overlay'; + } + return ( -
+
{searchForm}
-- cgit v1.2.3-1-g7c22 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/post_right.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'web/react/components/post_right.jsx') 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 From 6f091f0f6d17b74a5d87517ef35f89cd46e1bcb4 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Tue, 11 Aug 2015 15:31:07 -0700 Subject: Added check to make sure files are not strings --- web/react/components/post_right.jsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'web/react/components/post_right.jsx') diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index ad993aee1..ad8b54012 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -294,13 +294,8 @@ module.exports = React.createClass({ var currentId = UserStore.getCurrentId(); var searchForm = currentId == null ? null : ; - var fileDragOverlay = ''; - if (this.state.fileDrag) { - fileDragOverlay = 'post-right-file-overlay'; - } - return ( -
+
{searchForm}
-- cgit v1.2.3-1-g7c22 From 14c121dc0cccdd36f97b0b13cde6dd3a5802bb9e Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Wed, 12 Aug 2015 14:12:17 -0700 Subject: Implements better markup for css changes to be made, including an overlay of the dropzones and help pic/text --- web/react/components/post_right.jsx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'web/react/components/post_right.jsx') diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index ad8b54012..49c12ad9c 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -296,6 +296,10 @@ module.exports = React.createClass({ return (
+
+ Drop a file to upload it. + +
{searchForm}
-- cgit v1.2.3-1-g7c22 From 097257ade8b01a6f4ce4766cb844d06533bb74cf Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 13 Aug 2015 23:11:01 +0500 Subject: UI Upgrades to file overlay for uploads --- web/react/components/post_right.jsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'web/react/components/post_right.jsx') diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index 49c12ad9c..b772c7ee8 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -296,9 +296,11 @@ module.exports = React.createClass({ return (
-
- Drop a file to upload it. - +
+
+ + Drop a file to upload it. +
{searchForm}
-- cgit v1.2.3-1-g7c22 From 6ca6072f478f556ba2d25c9762f0d73c9e84c7f6 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 13 Aug 2015 23:33:18 +0500 Subject: Updating UI to cover RHS and the centre channel separately --- web/react/components/post_right.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components/post_right.jsx') diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index b772c7ee8..09cd8cb56 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -296,7 +296,7 @@ module.exports = React.createClass({ return (
-
+
Drop a file to upload it. -- cgit v1.2.3-1-g7c22 From 3a55cc6dcb8e45b65debd7569a49961faa55b402 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Thu, 13 Aug 2015 16:00:55 -0700 Subject: Minor refactoring for better maintainibility --- web/react/components/post_right.jsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'web/react/components/post_right.jsx') diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index 09cd8cb56..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,12 +297,8 @@ module.exports = React.createClass({ return (
-
-
- - Drop a file to upload it. -
-
+
{searchForm}
-- cgit v1.2.3-1-g7c22