From 9bbeef208fe9769618d2de3b69f0eb417eb007f8 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 6 Aug 2015 20:07:14 -0700
Subject: Added handlers for dragging and dropping files onto the center pane
 or RHS

---
 web/react/components/file_upload.jsx | 38 ++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'web/react/components/file_upload.jsx')

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)) {
-- 
cgit v1.2.3-1-g7c22

