summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/file_upload.jsx38
-rw-r--r--web/react/components/post_list.jsx6
2 files changed, 44 insertions, 0 deletions
diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx
index b90fa4fd3..aaf45c1ef 100644
--- a/web/react/components/file_upload.jsx
+++ b/web/react/components/file_upload.jsx
@@ -84,7 +84,45 @@ module.exports = React.createClass({
var inputDiv = this.refs.input.getDOMNode();
var self = this;
+<<<<<<< HEAD
document.addEventListener('paste', function(e) {
+=======
+ $('body').on('dragover', '.app__content', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ //e.target.style
+ console.log("HERE!: drag center");
+ });
+ $('body').on('dragover', '.sidebar--right', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ //e.target.style
+ console.log("HERE!: drag right");
+ });
+ $('body').on('dragenter', '.app__content', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ //e.target.style
+ console.log("HERE!: dragenter center");
+ });
+ $('body').on('dragenter', '.sidebar--right', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ //e.target.style
+ console.log("HERE!: dragenter right");
+ });
+ $('body').on('drop', '.app__content', function(e) {
+ if (e.originalEvent.dataTransfer)
+ e.preventDefault();
+ console.log("HERE!: drop center");
+ });
+ $('body').on('drop', '.sidebar--right', function(e) {
+ e.preventDefault();
+ console.log("HERE!: drop right");
+ });
+
+ document.addEventListener("paste", function(e) {
+>>>>>>> Added handlers for dragging and dropping files onto the center pane or RHS
var textarea = $(inputDiv.parentNode.parentNode).find('.custom-textarea')[0];
if (textarea !== e.target && !$.contains(textarea, e.target)) {
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 83f806b79..5724dbd62 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -125,6 +125,12 @@ module.exports = React.createClass({
}
});
+ //$('body').on('drop drag')
+ /*window.document.addEventListener("drop", function(e) {
+ e.preventDefault();
+ var centerPostList = $(inputDiv.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode).find('.post-list')[0];
+ console.log("HERE!: " + centerPostList);
+ });*/
},
componentDidUpdate: function() {
this.resize();